From 2b353d389c0b17f432faab9b5ba35e44b8ad4d94 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Mon, 19 Mar 2012 19:00:51 +1300 Subject: -Updated version to 4.5.1 -Changed build script to include Metro build -Changed build script to set assembly version to major version only -Documentation --- Build/Newtonsoft.Json.nuspec | 2 +- Build/build.ps1 | 12 +- Doc/versions.txt | 5 +- .../Newtonsoft.Json.Tests.Metro.csproj | 626 ++++++++++----------- .../Properties/AssemblyInfo.cs | 4 +- Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj | 5 +- Src/Newtonsoft.Json/Properties/AssemblyInfo.cs | 4 +- 7 files changed, 332 insertions(+), 326 deletions(-) diff --git a/Build/Newtonsoft.Json.nuspec b/Build/Newtonsoft.Json.nuspec index 53e2f34..5b1a08c 100644 --- a/Build/Newtonsoft.Json.nuspec +++ b/Build/Newtonsoft.Json.nuspec @@ -2,7 +2,7 @@ Newtonsoft.Json - 4.0.8 + 4.5.1 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 bb39c00..a5ef4e8 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -1,7 +1,8 @@ properties { - $zipFileName = "Json40r8.zip" - $majorVersion = "4.0.8" - $version = GetVersion $majorVersion + $zipFileName = "Json45r1.zip" + $majorVersion = "4.5" + $majorWithReleaseVersion = "4.5.1" + $version = GetVersion $majorWithReleaseVersion $signAssemblies = $false $signKeyPath = "D:\Development\Releases\newtonsoft.snk" $buildDocumentation = $false @@ -16,6 +17,7 @@ $workingDir = "$baseDir\Working" $builds = @( @{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net40"; NuGetDir = "net40"; 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}, # 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}, @@ -51,7 +53,7 @@ task Clean { task Build -depends Clean { Write-Host -ForegroundColor Green "Updating assembly version" Write-Host - Update-AssemblyInfoFiles $sourceDir ($majorVersion + '.0') $version + Update-AssemblyInfoFiles $sourceDir ($majorVersion + '.0.0') $version foreach ($build in $builds) { @@ -117,7 +119,7 @@ task Package -depends Build { Copy-Item -Path $docDir\readme.txt -Destination $workingDir\Package\ Copy-Item -Path $docDir\versions.txt -Destination $workingDir\Package\Bin\ - robocopy $sourceDir $workingDir\Package\Source\Src /MIR /NP /XD .svn bin obj /XF *.suo *.user + robocopy $sourceDir $workingDir\Package\Source\Src /MIR /NP /XD .svn bin obj TestResults /XF *.suo *.user robocopy $buildDir $workingDir\Package\Source\Build /MIR /NP /XD .svn robocopy $docDir $workingDir\Package\Source\Doc /MIR /NP /XD .svn robocopy $toolsDir $workingDir\Package\Source\Tools /MIR /NP /XD .svn diff --git a/Doc/versions.txt b/Doc/versions.txt index 4ed5b17..82e7cb8 100644 --- a/Doc/versions.txt +++ b/Doc/versions.txt @@ -3,7 +3,7 @@ Versions: Json.NET comes in different versions for the various .NET frameworks. -Net40: - .NET latest (4.0) + .NET latest (4.0 & 4.5) -Net35: .NET 3.5 SP1, Mono @@ -17,6 +17,9 @@ Json.NET comes in different versions for the various .NET frameworks. -WindowsPhone: Windows Phone 7 & 7.1 +-Metro + Windows 8 Metro, WinRT 4.5 + Notes: diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj index 31b4050..6735ed5 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro.csproj @@ -1,320 +1,320 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {8D9C2E69-9FD7-4A7A-866C-739C9207CD0B} - Library - Properties - Newtonsoft.Json.Tests - Newtonsoft.Json.Tests - en-US - 512 - {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Newtonsoft.Json.Tests.Metro_TemporaryKey.pfx - E58487D6BF8E40BC44C9BE962D19FB3EFBEB81BD - - - true - full - false - bin\Debug\ - DEBUG;TRACE;NETFX_CORE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE;NETFX_CORE - prompt - 4 - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - ARM - false - prompt - ExpressRules.ruleset - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - ARM - false - prompt - ExpressRules.ruleset - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - x64 - false - prompt - ExpressRules.ruleset - true - - - bin\x64\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - x64 - false - prompt - ExpressRules.ruleset - true - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - x86 - false - prompt - ExpressRules.ruleset - true - - - bin\x86\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - x86 - false - prompt - ExpressRules.ruleset - true - - - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - {263136a2-b89b-424e-a87a-f988caa8d032} - Newtonsoft.Json.Metro - - - - - - - 11.0 - - + + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {8D9C2E69-9FD7-4A7A-866C-739C9207CD0B} + Library + Properties + Newtonsoft.Json.Tests + Newtonsoft.Json.Tests + en-US + 512 + {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Newtonsoft.Json.Tests.Metro_TemporaryKey.pfx + E58487D6BF8E40BC44C9BE962D19FB3EFBEB81BD + + + true + full + false + bin\Debug\Metro\ + DEBUG;TRACE;NETFX_CORE + prompt + 4 + + + pdbonly + true + bin\Release\Metro\ + TRACE;NETFX_CORE + prompt + 4 + + + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE + ;2008 + full + ARM + false + prompt + ExpressRules.ruleset + true + + + bin\ARM\Release\ + TRACE;NETFX_CORE + true + ;2008 + pdbonly + ARM + false + prompt + ExpressRules.ruleset + true + + + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE + ;2008 + full + x64 + false + prompt + ExpressRules.ruleset + true + + + bin\x64\Release\ + TRACE;NETFX_CORE + true + ;2008 + pdbonly + x64 + false + prompt + ExpressRules.ruleset + true + + + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE + ;2008 + full + x86 + false + prompt + ExpressRules.ruleset + true + + + bin\x86\Release\ + TRACE;NETFX_CORE + true + ;2008 + pdbonly + x86 + false + prompt + ExpressRules.ruleset + true + + + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + {263136a2-b89b-424e-a87a-f988caa8d032} + Newtonsoft.Json.Metro + + + + + + + 11.0 + + + --> \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index e55896b..db242d2 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -70,7 +70,7 @@ 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.0.8.0")] +[assembly: AssemblyVersion("4.5.0.0")] #if !PocketPC -[assembly: AssemblyFileVersion("4.0.8.14718")] +[assembly: AssemblyFileVersion("4.5.1.14719")] #endif diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj index 4a9d96e..cf485b1 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj @@ -19,7 +19,7 @@ true full false - bin\Debug\ + bin\Debug\Metro\ DEBUG;TRACE;NETFX_CORE prompt 3 @@ -27,10 +27,11 @@ pdbonly true - bin\Release\ + bin\Release\Metro\ TRACE;NETFX_CORE prompt 4 + bin\Release\Metro\Newtonsoft.Json.xml true diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index 47b1f42..a399274 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -83,9 +83,9 @@ 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.0.8.0")] +[assembly: AssemblyVersion("4.5.0.0")] #if !PocketPC -[assembly: AssemblyFileVersion("4.0.8.14718")] +[assembly: AssemblyFileVersion("4.5.1.14719")] #endif [assembly: CLSCompliant(true)] -- cgit v1.2.3