-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
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>Newtonsoft.Json</id>
|
<id>Newtonsoft.Json</id>
|
||||||
<version>4.0.8</version>
|
<version>4.5.1</version>
|
||||||
<title>Json.NET</title>
|
<title>Json.NET</title>
|
||||||
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
|
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
|
||||||
<authors>James Newton-King</authors>
|
<authors>James Newton-King</authors>
|
||||||
|
|||||||
+7
-5
@@ -1,7 +1,8 @@
|
|||||||
properties {
|
properties {
|
||||||
$zipFileName = "Json40r8.zip"
|
$zipFileName = "Json45r1.zip"
|
||||||
$majorVersion = "4.0.8"
|
$majorVersion = "4.5"
|
||||||
$version = GetVersion $majorVersion
|
$majorWithReleaseVersion = "4.5.1"
|
||||||
|
$version = GetVersion $majorWithReleaseVersion
|
||||||
$signAssemblies = $false
|
$signAssemblies = $false
|
||||||
$signKeyPath = "D:\Development\Releases\newtonsoft.snk"
|
$signKeyPath = "D:\Development\Releases\newtonsoft.snk"
|
||||||
$buildDocumentation = $false
|
$buildDocumentation = $false
|
||||||
@@ -16,6 +17,7 @@
|
|||||||
$workingDir = "$baseDir\Working"
|
$workingDir = "$baseDir\Working"
|
||||||
$builds = @(
|
$builds = @(
|
||||||
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true},
|
@{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
|
# 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},
|
@{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 {
|
task Build -depends Clean {
|
||||||
Write-Host -ForegroundColor Green "Updating assembly version"
|
Write-Host -ForegroundColor Green "Updating assembly version"
|
||||||
Write-Host
|
Write-Host
|
||||||
Update-AssemblyInfoFiles $sourceDir ($majorVersion + '.0') $version
|
Update-AssemblyInfoFiles $sourceDir ($majorVersion + '.0.0') $version
|
||||||
|
|
||||||
foreach ($build in $builds)
|
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\readme.txt -Destination $workingDir\Package\
|
||||||
Copy-Item -Path $docDir\versions.txt -Destination $workingDir\Package\Bin\
|
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 $buildDir $workingDir\Package\Source\Build /MIR /NP /XD .svn
|
||||||
robocopy $docDir $workingDir\Package\Source\Doc /MIR /NP /XD .svn
|
robocopy $docDir $workingDir\Package\Source\Doc /MIR /NP /XD .svn
|
||||||
robocopy $toolsDir $workingDir\Package\Source\Tools /MIR /NP /XD .svn
|
robocopy $toolsDir $workingDir\Package\Source\Tools /MIR /NP /XD .svn
|
||||||
|
|||||||
+4
-1
@@ -3,7 +3,7 @@ Versions:
|
|||||||
Json.NET comes in different versions for the various .NET frameworks.
|
Json.NET comes in different versions for the various .NET frameworks.
|
||||||
|
|
||||||
-Net40:
|
-Net40:
|
||||||
.NET latest (4.0)
|
.NET latest (4.0 & 4.5)
|
||||||
|
|
||||||
-Net35:
|
-Net35:
|
||||||
.NET 3.5 SP1, Mono
|
.NET 3.5 SP1, Mono
|
||||||
@@ -17,6 +17,9 @@ Json.NET comes in different versions for the various .NET frameworks.
|
|||||||
-WindowsPhone:
|
-WindowsPhone:
|
||||||
Windows Phone 7 & 7.1
|
Windows Phone 7 & 7.1
|
||||||
|
|
||||||
|
-Metro
|
||||||
|
Windows 8 Metro, WinRT 4.5
|
||||||
|
|
||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
<OutputPath>bin\Debug\Metro\</OutputPath>
|
||||||
<DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
|
<DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<OutputPath>bin\Release\Metro\</OutputPath>
|
||||||
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
|
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ using System.Security;
|
|||||||
//
|
//
|
||||||
// You can specify all the values or you can default the Revision and Build Numbers
|
// You can specify all the values or you can default the Revision and Build Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
[assembly: AssemblyVersion("4.0.8.0")]
|
[assembly: AssemblyVersion("4.5.0.0")]
|
||||||
#if !PocketPC
|
#if !PocketPC
|
||||||
[assembly: AssemblyFileVersion("4.0.8.14718")]
|
[assembly: AssemblyFileVersion("4.5.1.14719")]
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
<OutputPath>bin\Debug\Metro\</OutputPath>
|
||||||
<DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
|
<DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>3</WarningLevel>
|
<WarningLevel>3</WarningLevel>
|
||||||
@@ -27,10 +27,11 @@
|
|||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<OutputPath>bin\Release\Metro\</OutputPath>
|
||||||
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
|
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<DocumentationFile>bin\Release\Metro\Newtonsoft.Json.xml</DocumentationFile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
|||||||
@@ -83,9 +83,9 @@ using System.Security;
|
|||||||
//
|
//
|
||||||
// You can specify all the values or you can default the Revision and Build Numbers
|
// You can specify all the values or you can default the Revision and Build Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
[assembly: AssemblyVersion("4.0.8.0")]
|
[assembly: AssemblyVersion("4.5.0.0")]
|
||||||
#if !PocketPC
|
#if !PocketPC
|
||||||
[assembly: AssemblyFileVersion("4.0.8.14718")]
|
[assembly: AssemblyFileVersion("4.5.1.14719")]
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
[assembly: CLSCompliant(true)]
|
[assembly: CLSCompliant(true)]
|
||||||
|
|||||||
Reference in New Issue
Block a user