From ce5800fc072464bf0da1b1b0c700b1e6ce2b33bf Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sat, 8 Sep 2012 00:07:54 -0700 Subject: [PATCH] -Renamed Metro project to WinRT -Incremented version to 4.5.9 --- Build/Newtonsoft.Json.nuspec | 2 +- Build/build.ps1 | 6 +++--- Doc/versions.txt | 9 ++++++--- ...ro.csproj => Newtonsoft.Json.Tests.WinRT.csproj} | 12 ++++++------ ...=> Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx} | Bin Src/Newtonsoft.Json.Tests/Package.appxmanifest | 4 ++-- .../Properties/AssemblyInfo.cs | 6 +++--- ...oft.Json.Metro.sln => Newtonsoft.Json.WinRT.sln} | 6 +++--- .../Converters/JsonValueConverter.cs | 2 -- ...on.Metro.csproj => Newtonsoft.Json.WinRT.csproj} | 6 +++--- Src/Newtonsoft.Json/Properties/AssemblyInfo.cs | 4 ++-- 11 files changed, 29 insertions(+), 28 deletions(-) rename Src/Newtonsoft.Json.Tests/{Newtonsoft.Json.Tests.Metro.csproj => Newtonsoft.Json.Tests.WinRT.csproj} (98%) rename Src/Newtonsoft.Json.Tests/{Newtonsoft.Json.Tests.Metro_TemporaryKey.pfx => Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx} (100%) rename Src/{Newtonsoft.Json.Metro.sln => Newtonsoft.Json.WinRT.sln} (94%) rename Src/Newtonsoft.Json/{Newtonsoft.Json.Metro.csproj => Newtonsoft.Json.WinRT.csproj} (98%) diff --git a/Build/Newtonsoft.Json.nuspec b/Build/Newtonsoft.Json.nuspec index 05ada0cc..3e97f0b2 100644 --- a/Build/Newtonsoft.Json.nuspec +++ b/Build/Newtonsoft.Json.nuspec @@ -2,7 +2,7 @@ Newtonsoft.Json - 4.5.8 + 4.5.9 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 84d699f7..4cc6d905 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -1,7 +1,7 @@ properties { - $zipFileName = "Json45r8.zip" + $zipFileName = "Json45r9.zip" $majorVersion = "4.5" - $majorWithReleaseVersion = "4.5.8" + $majorWithReleaseVersion = "4.5.9" $version = GetVersion $majorWithReleaseVersion $signAssemblies = $false $signKeyPath = "D:\Development\Releases\newtonsoft.snk" @@ -18,7 +18,7 @@ $builds = @( @{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true}, @{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = $null; Framework="net-4.0"; Sign=$true}, - @{Name = "Newtonsoft.Json.Metro"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="Metro"; NuGetDir = "winrt45"; Framework="net-4.5"; Sign=$true}, + @{Name = "Newtonsoft.Json.WinRT"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="WinRT"; NuGetDir = "winrt45"; Framework="net-4.5"; Sign=$true}, # unsigned SL/WP @{Name = "Newtonsoft.Json.WindowsPhone"; TestsName = $null; Constants="SILVERLIGHT;WINDOWS_PHONE"; FinalDir="WindowsPhone"; NuGetDir = "sl3-wp,sl4-windowsphone71"; Framework="net-4.0"; Sign=$false}, diff --git a/Doc/versions.txt b/Doc/versions.txt index b3fc2b67..7ecb9e25 100644 --- a/Doc/versions.txt +++ b/Doc/versions.txt @@ -6,7 +6,7 @@ Json.NET comes in different versions for the various .NET frameworks. .NET latest (4.0 & 4.5) -Net35: - .NET 3.5 SP1, Mono + .NET 3.5 SP1 -Net20: .NET 2.0 @@ -17,8 +17,11 @@ Json.NET comes in different versions for the various .NET frameworks. -WindowsPhone: Windows Phone 7 & 7.1 --Metro - Windows 8 Metro, WinRT 4.5 +-WinRT: + Windows 8 Store, WinRT 4.5 + +-Portable: + .NET 4.0, Silverlight 4, Windows Phone 7, WinRT 4.5 Notes: diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT.csproj similarity index 98% rename from Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj rename to Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT.csproj index 1bb1b1c4..2803ba5c 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT.csproj @@ -14,14 +14,14 @@ en-US 512 {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Newtonsoft.Json.Tests.Metro_TemporaryKey.pfx + Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx E58487D6BF8E40BC44C9BE962D19FB3EFBEB81BD true full false - bin\Debug\Metro\ + bin\Debug\WinRT\ DEBUG;TRACE;NETFX_CORE prompt 4 @@ -29,7 +29,7 @@ pdbonly true - bin\Release\Metro\ + bin\Release\WinRT\ TRACE;NETFX_CORE prompt 4 @@ -301,13 +301,13 @@ - + {263136a2-b89b-424e-a87a-f988caa8d032} - Newtonsoft.Json.Metro + Newtonsoft.Json.WinRT - + 11.0 diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro_TemporaryKey.pfx b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx similarity index 100% rename from Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro_TemporaryKey.pfx rename to Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx diff --git a/Src/Newtonsoft.Json.Tests/Package.appxmanifest b/Src/Newtonsoft.Json.Tests/Package.appxmanifest index a2a67efd..c74bed55 100644 --- a/Src/Newtonsoft.Json.Tests/Package.appxmanifest +++ b/Src/Newtonsoft.Json.Tests/Package.appxmanifest @@ -2,10 +2,10 @@ - Newtonsoft.Json.Tests.Metro + Newtonsoft.Json.Tests.WinRT James Images\UnitTestStoreLogo.png - Newtonsoft.Json.Tests.Metro + Newtonsoft.Json.Tests.WinRT 6.2 diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 82c70d36..aaa28c86 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -40,13 +40,13 @@ using System.Security; #elif PORTABLE [assembly: AssemblyTitle("Json.NET Tests Portable")] #elif NETFX_CORE -[assembly: AssemblyTitle("Json.NET Tests Metro")] +[assembly: AssemblyTitle("Json.NET Tests WinRT")] #elif NET20 [assembly: AssemblyTitle("Json.NET Tests .NET 2.0")] #elif NET35 [assembly: AssemblyTitle("Json.NET Tests .NET 3.5")] #else -[assembly: AssemblyTitle("Json.NET")] +[assembly: AssemblyTitle("Json.NET Tests")] #endif [assembly: AssemblyDescription("")] @@ -76,5 +76,5 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("4.5.0.0")] #if !PocketPC -[assembly: AssemblyFileVersion("4.5.8.15301")] +[assembly: AssemblyFileVersion("4.5.9.15307")] #endif diff --git a/Src/Newtonsoft.Json.Metro.sln b/Src/Newtonsoft.Json.WinRT.sln similarity index 94% rename from Src/Newtonsoft.Json.Metro.sln rename to Src/Newtonsoft.Json.WinRT.sln index 687fce8f..c24d8d0c 100644 --- a/Src/Newtonsoft.Json.Metro.sln +++ b/Src/Newtonsoft.Json.WinRT.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 11 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Metro", "Newtonsoft.Json\Newtonsoft.Json.Metro.csproj", "{263136A2-B89B-424E-A87A-F988CAA8D032}" +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.WinRT", "Newtonsoft.Json\Newtonsoft.Json.WinRT.csproj", "{263136A2-B89B-424E-A87A-F988CAA8D032}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Tests.Metro", "Newtonsoft.Json.Tests\Newtonsoft.Json.Tests.Metro.csproj", "{8D9C2E69-9FD7-4A7A-866C-739C9207CD0B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Tests.WinRT", "Newtonsoft.Json.Tests\Newtonsoft.Json.Tests.WinRT.csproj", "{8D9C2E69-9FD7-4A7A-866C-739C9207CD0B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Src/Newtonsoft.Json/Converters/JsonValueConverter.cs b/Src/Newtonsoft.Json/Converters/JsonValueConverter.cs index 7ffc9db2..20c4be87 100644 --- a/Src/Newtonsoft.Json/Converters/JsonValueConverter.cs +++ b/Src/Newtonsoft.Json/Converters/JsonValueConverter.cs @@ -34,13 +34,11 @@ namespace Newtonsoft.Json.Converters { public class JsonValueConverter : JsonConverter { - [SecuritySafeCritical] public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { WriteJsonValue(writer, (IJsonValue)value); } - [SecuritySafeCritical] private void WriteJsonValue(JsonWriter writer, IJsonValue value) { switch (value.ValueType) diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj similarity index 98% rename from Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj rename to Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj index 243efa5e..61373b84 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.WinRT.csproj @@ -19,7 +19,7 @@ true full false - bin\Debug\Metro\ + bin\Debug\WinRT\ DEBUG;TRACE;NETFX_CORE prompt 3 @@ -27,11 +27,11 @@ pdbonly true - bin\Release\Metro\ + bin\Release\WinRT\ TRACE;NETFX_CORE prompt 4 - bin\Release\Metro\Newtonsoft.Json.xml + bin\Release\WinRT\Newtonsoft.Json.xml true diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index 523fda5e..2696467b 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -41,7 +41,7 @@ using System.Security; #elif PORTABLE [assembly: AssemblyTitle("Json.NET Portable")] #elif NETFX_CORE -[assembly: AssemblyTitle("Json.NET Metro")] +[assembly: AssemblyTitle("Json.NET WinRT")] #elif NET20 [assembly: AssemblyTitle("Json.NET .NET 2.0")] [assembly: AllowPartiallyTrustedCallers] @@ -90,7 +90,7 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("4.5.0.0")] #if !PocketPC -[assembly: AssemblyFileVersion("4.5.8.15301")] +[assembly: AssemblyFileVersion("4.5.9.15307")] #endif [assembly: CLSCompliant(true)]