From 9420c0003df56420adc96804b2fc48902cb8d584 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Tue, 24 Jul 2012 15:13:20 -0700 Subject: [PATCH 1/2] -Added SecurityTransparent attribute to Metro build --- Src/Newtonsoft.Json/Properties/AssemblyInfo.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index 963a32a8..1a7d2a45 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -42,6 +42,7 @@ using System.Security; [assembly: AssemblyTitle("Json.NET Portable")] #elif NETFX_CORE [assembly: AssemblyTitle("Json.NET Metro")] +[assembly: SecurityTransparent] #elif NET20 [assembly: AssemblyTitle("Json.NET .NET 2.0")] [assembly: AllowPartiallyTrustedCallers] From c0dc3889506c050383a407105974e7e63203a7c1 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Tue, 24 Jul 2012 17:51:13 -0700 Subject: [PATCH 2/2] -Fixed build -Incremented version to 4.5.8 --- Build/Newtonsoft.Json.nuspec | 2 +- Build/build.ps1 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Build/Newtonsoft.Json.nuspec b/Build/Newtonsoft.Json.nuspec index c827c01c..05ada0cc 100644 --- a/Build/Newtonsoft.Json.nuspec +++ b/Build/Newtonsoft.Json.nuspec @@ -2,7 +2,7 @@ Newtonsoft.Json - 4.5.7 + 4.5.8 Json.NET Json.NET is a popular high-performance JSON framework for .NET James Newton-King diff --git a/Build/build.ps1 b/Build/build.ps1 index 311ff166..84d699f7 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -1,7 +1,7 @@ properties { - $zipFileName = "Json45r7.zip" + $zipFileName = "Json45r8.zip" $majorVersion = "4.5" - $majorWithReleaseVersion = "4.5.7" + $majorWithReleaseVersion = "4.5.8" $version = GetVersion $majorWithReleaseVersion $signAssemblies = $false $signKeyPath = "D:\Development\Releases\newtonsoft.snk" @@ -113,7 +113,6 @@ task Package -depends Build { # Sandcastle has issues when compiling with .NET 4 MSBuild - http://shfb.codeplex.com/Thread/View.aspx?ThreadId=50652 exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release "/p:DocumentationSourcePath=$documentationSourcePath" $docDir\doc.shfbproj } "Error building documentation. Check that you have Sandcastle, Sandcastle Help File Builder and HTML Help Workshop installed." - move -Path $workingDir\Documentation\Documentation.chm -Destination $workingDir\Package\Documentation.chm move -Path $workingDir\Documentation\LastBuild.log -Destination $workingDir\Documentation.log }