LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Incremented version to 6.0.4

Browse Source 
-Removed unused file
This commit is contained in:
James Newton-King
2014-07-21 14:33:23 +12:00
parent e32b4671c8
commit ee170dc551
12 changed files with 21 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Build/Newtonsoft.Json.nuspec
+1 -1
View File
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Newtonsoft.Json</id>
<version>6.0.3</version>
<version>6.0.4</version>
<title>Json.NET</title>
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
<authors>James Newton-King</authors>
Build/build.ps1
+2 -2
View File
@@ -1,7 +1,7 @@
properties {
$zipFileName = "Json60r3.zip"
$zipFileName = "Json60r4.zip"
$majorVersion = "6.0"
$majorWithReleaseVersion = "6.0.3"
$majorWithReleaseVersion = "6.0.4"
$version = GetVersion $majorWithReleaseVersion
$signAssemblies = $false
$signKeyPath = "C:\Development\Releases\newtonsoft.snk"
Src/Newtonsoft.Json.Tests/PerformanceTests.cs
+16
View File
@@ -132,6 +132,22 @@ namespace Newtonsoft.Json.Tests
SerializeTests(test);
}
[Test]
public void SerializeKeyValuePair()
{
IList<KeyValuePair<string, int>> value = new List<KeyValuePair<string, int>>();
for (int i = 0; i < 100; i++)
{
value.Add(new KeyValuePair<string, int>("Key" + i, i));
}
BenchmarkSerializeMethod(SerializeMethod.JsonNet, value);
string json = JsonConvert.SerializeObject(value);
BenchmarkDeserializeMethod<IList<KeyValuePair<string, int>>>(SerializeMethod.JsonNet, json);
}
private void SerializeTests(object value)
{
BenchmarkSerializeMethod(SerializeMethod.DataContractSerializer, value);
Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -75,4 +75,4 @@ using System.Security;
// by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.3.17520")]
[assembly: AssemblyFileVersion("6.0.3.17521")]
Src/Newtonsoft.Json/Newtonsoft.Json.Net20.csproj
-1
View File
@@ -244,7 +244,6 @@
<Compile Include="Utilities\DictionaryWrapper.cs" />
<Compile Include="Utilities\EnumUtils.cs" />
<Compile Include="Utilities\EnumValue.cs" />
<Compile Include="Utilities\EnumValues.cs" />
<Compile Include="Utilities\JavaScriptUtils.cs" />
<Compile Include="JsonToken.cs" />
<Compile Include="JsonWriter.cs" />
Src/Newtonsoft.Json/Newtonsoft.Json.Net35.csproj
-1
View File
@@ -257,7 +257,6 @@
<Compile Include="Utilities\DictionaryWrapper.cs" />
<Compile Include="Utilities\EnumUtils.cs" />
<Compile Include="Utilities\EnumValue.cs" />
<Compile Include="Utilities\EnumValues.cs" />
<Compile Include="Utilities\JavaScriptUtils.cs" />
<Compile Include="JsonToken.cs" />
<Compile Include="JsonWriter.cs" />
Src/Newtonsoft.Json/Newtonsoft.Json.Net40.csproj
-1
View File
@@ -257,7 +257,6 @@
<Compile Include="Utilities\DictionaryWrapper.cs" />
<Compile Include="Utilities\EnumUtils.cs" />
<Compile Include="Utilities\EnumValue.cs" />
<Compile Include="Utilities\EnumValues.cs" />
<Compile Include="Utilities\JavaScriptUtils.cs" />
<Compile Include="JsonToken.cs" />
<Compile Include="JsonWriter.cs" />
Src/Newtonsoft.Json/Newtonsoft.Json.Portable.csproj
-1
View File
@@ -210,7 +210,6 @@
<Compile Include="Utilities\DynamicUtils.cs" />
<Compile Include="Utilities\EnumUtils.cs" />
<Compile Include="Utilities\EnumValue.cs" />
<Compile Include="Utilities\EnumValues.cs" />
<Compile Include="Utilities\FSharpUtils.cs" />
<Compile Include="Utilities\ILGeneratorExtensions.cs" />
<Compile Include="Utilities\ImmutableCollectionsUtils.cs" />
Src/Newtonsoft.Json/Newtonsoft.Json.Portable40.csproj
-1
View File
@@ -214,7 +214,6 @@
<Compile Include="Utilities\DynamicUtils.cs" />
<Compile Include="Utilities\EnumUtils.cs" />
<Compile Include="Utilities\EnumValue.cs" />
<Compile Include="Utilities\EnumValues.cs" />
<Compile Include="Utilities\ExpressionReflectionDelegateFactory.cs" />
<Compile Include="Utilities\FSharpUtils.cs" />
<Compile Include="Utilities\ILGeneratorExtensions.cs" />
Src/Newtonsoft.Json/Newtonsoft.Json.csproj
-1
View File
@@ -214,7 +214,6 @@
<Compile Include="Utilities\ReflectionObject.cs" />
<Compile Include="Utilities\EnumUtils.cs" />
<Compile Include="Utilities\EnumValue.cs" />
<Compile Include="Utilities\EnumValues.cs" />
<Compile Include="Utilities\ExpressionReflectionDelegateFactory.cs" />
<Compile Include="Utilities\FSharpUtils.cs" />
<Compile Include="Utilities\ILGeneratorExtensions.cs" />
Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -91,5 +91,5 @@ using System.Security;
// by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.3.17520")]
[assembly: AssemblyFileVersion("6.0.3.17521")]
[assembly: CLSCompliant(true)]
Src/Newtonsoft.Json/Utilities/EnumValues.cs
-37
View File
@@ -1,37 +0,0 @@
//#region License
//// Copyright (c) 2007 James Newton-King
////
//// Permission is hereby granted, free of charge, to any person
//// obtaining a copy of this software and associated documentation
//// files (the "Software"), to deal in the Software without
//// restriction, including without limitation the rights to use,
//// copy, modify, merge, publish, distribute, sublicense, and/or sell
//// copies of the Software, and to permit persons to whom the
//// Software is furnished to do so, subject to the following
//// conditions:
////
//// The above copyright notice and this permission notice shall be
//// included in all copies or substantial portions of the Software.
////
//// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
//// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
//// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
//// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
//// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
//// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
//// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
//// OTHER DEALINGS IN THE SOFTWARE.
//#endregion
//using System.Collections.ObjectModel;
//namespace Newtonsoft.Json.Utilities
//{
// internal class EnumValues<T> : KeyedCollection<string, EnumValue<T>> where T : struct
// {
// protected override string GetKeyForItem(EnumValue<T> item)
// {
// return item.Name;
// }
// }
//}