From e28d1bbda9c307e6bb9f4bc3db590e0779eb7551 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 13 Oct 2013 18:57:48 +1300 Subject: [PATCH] -Fixed build warning -Fixed documentation IE7 JS error --- Build/build.ps1 | 2 ++ Doc/Introduction.aml | 4 ---- Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs | 2 +- Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs | 1 - Src/Newtonsoft.Json/Properties/AssemblyInfo.cs | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Build/build.ps1 b/Build/build.ps1 index 976869c5..a9e11126 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -97,6 +97,8 @@ task Package -depends Build { } } + robocopy $sourceDir $workingDir\NuGet\src *.cs /S /NP /XD Newtonsoft.Json.Tests obj | Out-Default + exec { .\Tools\NuGet\NuGet.exe pack $workingDir\NuGet\Newtonsoft.Json.nuspec -Symbols } move -Path .\*.nupkg -Destination $workingDir\NuGet } diff --git a/Doc/Introduction.aml b/Doc/Introduction.aml index ac4313c1..0b722a56 100644 --- a/Doc/Introduction.aml +++ b/Doc/Introduction.aml @@ -100,10 +100,6 @@ and write from your objects. _blank , Microsoft's HTTP service framework. - - - - diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index da510de6..39f3313a 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -75,4 +75,4 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly: AssemblyVersion("4.5.0.0")] -[assembly: AssemblyFileVersion("5.0.7.16611")] +[assembly: AssemblyFileVersion("5.0.7.16612")] diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 202a6cbc..250ffd15 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -75,7 +75,6 @@ using System.Linq.Expressions; #endif #if !(NET35 || NET20) using System.Dynamic; -using System.ComponentModel; #endif #if NET20 using Newtonsoft.Json.Utilities.LinqBridge; diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index 8e04a229..705c9ca9 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -92,6 +92,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: [assembly: AssemblyVersion("4.5.0.0")] -[assembly: AssemblyFileVersion("5.0.7.16611")] +[assembly: AssemblyFileVersion("5.0.7.16612")] [assembly: CLSCompliant(true)]