From 6bb1b77fa482e0df459b253ef4d5a27db2394c7d Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Fri, 12 Sep 2014 20:14:53 +1200 Subject: [PATCH] -Fixed tests --- Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj | 2 +- Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj | 2 +- Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj | 2 +- Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj | 2 +- .../Newtonsoft.Json.Tests.Portable40.csproj | 2 +- Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs | 2 +- Src/Newtonsoft.Json/Properties/AssemblyInfo.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj index 3b6d2ad4..d54e8af7 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj @@ -334,7 +334,7 @@ - + PreserveNewest diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj index dab0be51..381319bb 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj @@ -344,7 +344,7 @@ LinqToSqlClasses.designer.cs Designer - + PreserveNewest diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj index d07bd6e0..30eb158d 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj @@ -529,7 +529,7 @@ Always - + PreserveNewest diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj index 009c7ccc..1aa5087f 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj @@ -375,7 +375,7 @@ - + PreserveNewest diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj index 1b850686..c83373ca 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj @@ -382,7 +382,7 @@ - + PreserveNewest diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 12c3fbea..e7d88bd6 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -75,4 +75,4 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.5.17710")] +[assembly: AssemblyFileVersion("6.0.5.17712")] diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index d8e50de6..56af0cba 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -91,5 +91,5 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.5.17710")] +[assembly: AssemblyFileVersion("6.0.5.17712")] [assembly: CLSCompliant(true)]