Skip to content

Commit 936acbf

Browse files
JamesNKJamesNK
authored
Update version to 13.0.1-beta and remove portable builds (#2228)
1 parent 9be95e0 commit 936acbf

File tree

4 files changed

+6
-72
lines changed

4 files changed

+6
-72
lines changed

‎Build/build.ps1‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
@{Framework = "net45"; TestsFunction = "NUnitTests"; TestFramework = "net46"; NUnitFramework="net-4.0"; Enabled=$true},
3838
@{Framework = "net40"; TestsFunction = "NUnitTests"; NUnitFramework="net-4.0"; Enabled=$true},
3939
@{Framework = "net35"; TestsFunction = "NUnitTests"; NUnitFramework="net-2.0"; Enabled=$true},
40-
@{Framework = "net20"; TestsFunction = "NUnitTests"; NUnitFramework="net-2.0"; Enabled=$true},
41-
@{Framework = "portable-net45+win8+wpa81+wp8"; TestsFunction = "NUnitTests"; TestFramework = "net452"; NUnitFramework="net-4.0"; Enabled=$true},
42-
@{Framework = "portable-net40+win8+wpa81+wp8+sl5"; TestsFunction = "NUnitTests"; TestFramework = "net451"; NUnitFramework="net-4.0"; Enabled=$true}
40+
@{Framework = "net20"; TestsFunction = "NUnitTests"; NUnitFramework="net-2.0"; Enabled=$true}
4341
)
4442
}
4543

‎Build/version.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"Major": 12,
3-
"Release": 3,
4-
"Prerelease": null,
2+
"Major": 13,
3+
"Release": 1,
4+
"Prerelease": "beta1",
55
"Assembly": null
66
}

‎Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj‎

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(TestFrameworks)'==''">net46;net451;net452;net40;net35;net20;netcoreapp3.0;netcoreapp2.2;netcoreapp2.1</TargetFrameworks>
3+
<TargetFrameworks Condition="'$(TestFrameworks)'==''">net46;net40;net35;net20;netcoreapp3.0;netcoreapp2.2;netcoreapp2.1</TargetFrameworks>
44
<TargetFrameworks Condition="'$(TestFrameworks)'!=''">$(TestFrameworks)</TargetFrameworks>
55
<LangVersion>8.0</LangVersion>
66
<VersionPrefix>1.0</VersionPrefix>
@@ -65,52 +65,6 @@
6565
<DefineConstants>NET45;HAVE_BENCHMARKS;$(AdditionalConstants)</DefineConstants>
6666
</PropertyGroup>
6767

68-
<ItemGroup Condition="'$(TargetFramework)'=='net451'">
69-
<PackageReference Include="NUnit" Version="$(NunitPackageVersion)" />
70-
<PackageReference Include="NUnit3TestAdapter" Version="$(Nunit3TestAdapterPackageVersion)" />
71-
<PackageReference Include="Autofac" Version="$(AutofacPackageVersion)" />
72-
<PackageReference Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" />
73-
<PackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
74-
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
75-
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" />
76-
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
77-
<Reference Include="Microsoft.CSharp" />
78-
<Reference Include="System.Web" />
79-
<Reference Include="System.Data.Linq" />
80-
<Reference Include="System.Data.Entity" />
81-
<Reference Include="System.ComponentModel.DataAnnotations" />
82-
<Reference Include="System.Web.Extensions" />
83-
<Reference Include="System.Data.DataSetExtensions" />
84-
</ItemGroup>
85-
<PropertyGroup Condition="'$(TargetFramework)'=='net451'">
86-
<AssemblyTitle>Json.NET Tests Portable .NET 4.0</AssemblyTitle>
87-
<ReferringTargetFrameworkForProjectReferences>.NETPortable,Version=v0.0,Profile=Profile328</ReferringTargetFrameworkForProjectReferences>
88-
<DefineConstants>PORTABLE40;$(AdditionalConstants)</DefineConstants>
89-
</PropertyGroup>
90-
91-
<ItemGroup Condition="'$(TargetFramework)'=='net452'">
92-
<PackageReference Include="NUnit" Version="$(NunitPackageVersion)" />
93-
<PackageReference Include="NUnit3TestAdapter" Version="$(Nunit3TestAdapterPackageVersion)" />
94-
<PackageReference Include="Autofac" Version="$(AutofacPackageVersion)" />
95-
<PackageReference Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" />
96-
<PackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
97-
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
98-
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" />
99-
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
100-
<Reference Include="Microsoft.CSharp" />
101-
<Reference Include="System.Web" />
102-
<Reference Include="System.Data.Linq" />
103-
<Reference Include="System.Data.Entity" />
104-
<Reference Include="System.ComponentModel.DataAnnotations" />
105-
<Reference Include="System.Web.Extensions" />
106-
<Reference Include="System.Data.DataSetExtensions" />
107-
</ItemGroup>
108-
<PropertyGroup Condition="'$(TargetFramework)'=='net452'">
109-
<AssemblyTitle>Json.NET Tests Portable</AssemblyTitle>
110-
<ReferringTargetFrameworkForProjectReferences>.NETPortable,Version=v0.0,Profile=Profile259</ReferringTargetFrameworkForProjectReferences>
111-
<DefineConstants>PORTABLE;$(AdditionalConstants)</DefineConstants>
112-
</PropertyGroup>
113-
11468
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
11569
<PackageReference Include="NUnit" Version="$(NunitPackageVersion)" />
11670
<PackageReference Include="NUnit3TestAdapter" Version="$(Nunit3TestAdapterPackageVersion)" />

‎Src/Newtonsoft.Json/Newtonsoft.Json.csproj‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(LibraryFrameworks)'==''">net45;net40;net35;net20;netstandard1.0;netstandard1.3;netstandard2.0;portable-net45+win8+wpa81+wp8;portable-net40+win8+wpa81+wp8+sl5</TargetFrameworks>
3+
<TargetFrameworks Condition="'$(LibraryFrameworks)'==''">net45;net40;net35;net20;netstandard1.0;netstandard1.3;netstandard2.0</TargetFrameworks>
44
<TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>
55
<LangVersion>8.0</LangVersion>
66
<!-- version numbers will be updated by build -->
@@ -80,22 +80,4 @@
8080
<AssemblyTitle>Json.NET .NET Standard 2.0</AssemblyTitle>
8181
<DefineConstants>NETSTANDARD2_0;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;HAVE_CONCURRENT_DICTIONARY;$(AdditionalConstants)</DefineConstants>
8282
</PropertyGroup>
83-
<PropertyGroup Condition="'$(TargetFramework)' == 'portable-net40+win8+wpa81+wp8+sl5'">
84-
<AssemblyTitle>Json.NET Portable .NET 4.0</AssemblyTitle>
85-
<DefineConstants>PORTABLE40;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_OBSOLETE_FORMATTER_ASSEMBLY_STYLE;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;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_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;$(AdditionalConstants)</DefineConstants>
86-
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
87-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
88-
<TargetFrameworkProfile>Profile328</TargetFrameworkProfile>
89-
<NugetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile328</NugetTargetMoniker>
90-
<LanguageTargets>$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets</LanguageTargets>
91-
</PropertyGroup>
92-
<PropertyGroup Condition="'$(TargetFramework)' == 'portable-net45+win8+wpa81+wp8'">
93-
<AssemblyTitle>Json.NET Portable</AssemblyTitle>
94-
<DefineConstants>PORTABLE;HAVE_ASYNC;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DYNAMIC;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_GUID_TRY_PARSE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;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_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_OBSOLETE_FORMATTER_ASSEMBLY_STYLE;$(AdditionalConstants)</DefineConstants>
95-
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
96-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
97-
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
98-
<NugetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile259</NugetTargetMoniker>
99-
<LanguageTargets>$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets</LanguageTargets>
100-
</PropertyGroup>
10183
</Project>

0 commit comments

Comments
 (0)