From 7b8c3b0ed0380cf76d66894e81bf4d4d5b0bd796 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Mon, 29 Jul 2019 10:48:56 +1200 Subject: [PATCH] Move dependency version numbers to shared file (#2109) --- Src/Directory.Build.props | 26 ++++ .../Newtonsoft.Json.Tests.csproj | 140 +++++++++--------- Src/Newtonsoft.Json.sln | 10 +- Src/Newtonsoft.Json/Newtonsoft.Json.csproj | 16 +- 4 files changed, 111 insertions(+), 81 deletions(-) create mode 100644 Src/Directory.Build.props diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props new file mode 100644 index 00000000..a8d08cb1 --- /dev/null +++ b/Src/Directory.Build.props @@ -0,0 +1,26 @@ + + + 4.6.2 + 0.10.10 + 4.2.3 + 2.9.2 + 4.3.0 + 1.0.0-beta2-18618-05 + 3.3.0-beta1-final + 15.7.2 + 4.8.1 + 3.11.0 + 3.13.0 + 4.4.0 + 1.4.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.3.0 + 4.4.0 + 2.3.1 + 2.3.1 + + diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj index 201ee13e..1c8db22a 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj @@ -42,15 +42,15 @@ - - - - - - - - - + + + + + + + + + @@ -66,14 +66,14 @@ - - - - - - - - + + + + + + + + @@ -89,14 +89,14 @@ - - - - - - - - + + + + + + + + @@ -112,9 +112,9 @@ - - - + + + @@ -129,8 +129,8 @@ - - + + @@ -144,8 +144,8 @@ - - + + @@ -154,19 +154,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + Json.NET Tests .NET Standard 2.0 @@ -175,19 +175,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + Json.NET Tests .NET Standard 1.3 @@ -196,18 +196,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + Json.NET Tests .NET Standard 1.0 diff --git a/Src/Newtonsoft.Json.sln b/Src/Newtonsoft.Json.sln index cbfa2bb4..10feeda9 100644 --- a/Src/Newtonsoft.Json.sln +++ b/Src/Newtonsoft.Json.sln @@ -1,10 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26403.7 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29123.89 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B520C700-7D45-4D82-BFB5-218FA68CF5CF}" ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props global.json = global.json NuGet.Config = NuGet.Config EndProjectSection @@ -13,7 +14,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Newtonsoft.Json", "Newtonso EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Newtonsoft.Json.Tests", "Newtonsoft.Json.Tests\Newtonsoft.Json.Tests.csproj", "{462EA9B9-8532-4330-9160-DF3450C70880}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.TestConsole", "Newtonsoft.Json.TestConsole\Newtonsoft.Json.TestConsole.csproj", "{3CC9C2DF-CD0A-4096-BF46-B4AFDF0147D2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Newtonsoft.Json.TestConsole", "Newtonsoft.Json.TestConsole\Newtonsoft.Json.TestConsole.csproj", "{3CC9C2DF-CD0A-4096-BF46-B4AFDF0147D2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -65,4 +66,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {225F391C-701E-49A2-8193-085EC2586689} + EndGlobalSection EndGlobal diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj index 5e13af50..ceeeb197 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.csproj @@ -36,10 +36,10 @@ - - + + - + Json.NET @@ -58,17 +58,17 @@ NET20;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CAS;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_DB_NULL_TYPE_CODE;HAVE_EMPTY_TYPES;HAVE_FAST_REVERSE;HAVE_FULL_REFLECTION;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_MEMORY_BARRIER;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_REFLECTION_EMIT;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;$(AdditionalConstants) - - - + + + Json.NET .NET Standard 1.0 NETSTANDARD1_0;PORTABLE;HAVE_ASYNC;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DYNAMIC;HAVE_EXPRESSIONS;HAVE_FSHARP_TYPES;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_ISET;HAVE_LINQ;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_BINDER;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_OBSOLETE_FORMATTER_ASSEMBLY_STYLE;$(AdditionalConstants) - - + + Json.NET .NET Standard 1.3