-Renamed Metro project to WinRT

-Incremented version to 4.5.9
This commit is contained in:
James Newton-King
2012-09-08 00:07:54 -07:00
parent 6ca79ee04e
commit ce5800fc07
11 changed files with 29 additions and 28 deletions
+1 -1
View File
@@ -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.5.8</version> <version>4.5.9</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>
+3 -3
View File
@@ -1,7 +1,7 @@
properties { properties {
$zipFileName = "Json45r8.zip" $zipFileName = "Json45r9.zip"
$majorVersion = "4.5" $majorVersion = "4.5"
$majorWithReleaseVersion = "4.5.8" $majorWithReleaseVersion = "4.5.9"
$version = GetVersion $majorWithReleaseVersion $version = GetVersion $majorWithReleaseVersion
$signAssemblies = $false $signAssemblies = $false
$signKeyPath = "D:\Development\Releases\newtonsoft.snk" $signKeyPath = "D:\Development\Releases\newtonsoft.snk"
@@ -18,7 +18,7 @@
$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.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = $null; 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 # 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},
+6 -3
View File
@@ -6,7 +6,7 @@ Json.NET comes in different versions for the various .NET frameworks.
.NET latest (4.0 & 4.5) .NET latest (4.0 & 4.5)
-Net35: -Net35:
.NET 3.5 SP1, Mono .NET 3.5 SP1
-Net20: -Net20:
.NET 2.0 .NET 2.0
@@ -17,8 +17,11 @@ Json.NET comes in different versions for the various .NET frameworks.
-WindowsPhone: -WindowsPhone:
Windows Phone 7 & 7.1 Windows Phone 7 & 7.1
-Metro -WinRT:
Windows 8 Metro, WinRT 4.5 Windows 8 Store, WinRT 4.5
-Portable:
.NET 4.0, Silverlight 4, Windows Phone 7, WinRT 4.5
Notes: Notes:
@@ -14,14 +14,14 @@
<DefaultLanguage>en-US</DefaultLanguage> <DefaultLanguage>en-US</DefaultLanguage>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>Newtonsoft.Json.Tests.Metro_TemporaryKey.pfx</PackageCertificateKeyFile> <PackageCertificateKeyFile>Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>E58487D6BF8E40BC44C9BE962D19FB3EFBEB81BD</PackageCertificateThumbprint> <PackageCertificateThumbprint>E58487D6BF8E40BC44C9BE962D19FB3EFBEB81BD</PackageCertificateThumbprint>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\Metro\</OutputPath> <OutputPath>bin\Debug\WinRT\</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\Metro\</OutputPath> <OutputPath>bin\Release\WinRT\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE</DefineConstants> <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@@ -301,13 +301,13 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Metro.csproj"> <ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.WinRT.csproj">
<Project>{263136a2-b89b-424e-a87a-f988caa8d032}</Project> <Project>{263136a2-b89b-424e-a87a-f988caa8d032}</Project>
<Name>Newtonsoft.Json.Metro</Name> <Name>Newtonsoft.Json.WinRT</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Newtonsoft.Json.Tests.Metro_TemporaryKey.pfx" /> <None Include="Newtonsoft.Json.Tests.WinRT_TemporaryKey.pfx" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' "> <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' ">
<VisualStudioVersion>11.0</VisualStudioVersion> <VisualStudioVersion>11.0</VisualStudioVersion>
@@ -2,10 +2,10 @@
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest"> <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
<Identity Name="A8B0D936-59D4-42B2-8044-E3920F5398BD" Publisher="CN=James" Version="1.0.0.0" /> <Identity Name="A8B0D936-59D4-42B2-8044-E3920F5398BD" Publisher="CN=James" Version="1.0.0.0" />
<Properties> <Properties>
<DisplayName>Newtonsoft.Json.Tests.Metro</DisplayName> <DisplayName>Newtonsoft.Json.Tests.WinRT</DisplayName>
<PublisherDisplayName>James</PublisherDisplayName> <PublisherDisplayName>James</PublisherDisplayName>
<Logo>Images\UnitTestStoreLogo.png</Logo> <Logo>Images\UnitTestStoreLogo.png</Logo>
<Description>Newtonsoft.Json.Tests.Metro</Description> <Description>Newtonsoft.Json.Tests.WinRT</Description>
</Properties> </Properties>
<Prerequisites> <Prerequisites>
<OSMinVersion>6.2</OSMinVersion> <OSMinVersion>6.2</OSMinVersion>
@@ -40,13 +40,13 @@ using System.Security;
#elif PORTABLE #elif PORTABLE
[assembly: AssemblyTitle("Json.NET Tests Portable")] [assembly: AssemblyTitle("Json.NET Tests Portable")]
#elif NETFX_CORE #elif NETFX_CORE
[assembly: AssemblyTitle("Json.NET Tests Metro")] [assembly: AssemblyTitle("Json.NET Tests WinRT")]
#elif NET20 #elif NET20
[assembly: AssemblyTitle("Json.NET Tests .NET 2.0")] [assembly: AssemblyTitle("Json.NET Tests .NET 2.0")]
#elif NET35 #elif NET35
[assembly: AssemblyTitle("Json.NET Tests .NET 3.5")] [assembly: AssemblyTitle("Json.NET Tests .NET 3.5")]
#else #else
[assembly: AssemblyTitle("Json.NET")] [assembly: AssemblyTitle("Json.NET Tests")]
#endif #endif
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
@@ -76,5 +76,5 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("4.5.0.0")] [assembly: AssemblyVersion("4.5.0.0")]
#if !PocketPC #if !PocketPC
[assembly: AssemblyFileVersion("4.5.8.15301")] [assembly: AssemblyFileVersion("4.5.9.15307")]
#endif #endif
@@ -1,9 +1,9 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 11 # Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Metro", "Newtonsoft.Json\Newtonsoft.Json.Metro.csproj", "{263136A2-B89B-424E-A87A-F988CAA8D032}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.WinRT", "Newtonsoft.Json\Newtonsoft.Json.WinRT.csproj", "{263136A2-B89B-424E-A87A-F988CAA8D032}"
EndProject 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,13 +34,11 @@ namespace Newtonsoft.Json.Converters
{ {
public class JsonValueConverter : JsonConverter public class JsonValueConverter : JsonConverter
{ {
[SecuritySafeCritical]
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{ {
WriteJsonValue(writer, (IJsonValue)value); WriteJsonValue(writer, (IJsonValue)value);
} }
[SecuritySafeCritical]
private void WriteJsonValue(JsonWriter writer, IJsonValue value) private void WriteJsonValue(JsonWriter writer, IJsonValue value)
{ {
switch (value.ValueType) switch (value.ValueType)
@@ -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\Metro\</OutputPath> <OutputPath>bin\Debug\WinRT\</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,11 +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\Metro\</OutputPath> <OutputPath>bin\Release\WinRT\</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> <DocumentationFile>bin\Release\WinRT\Newtonsoft.Json.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@@ -41,7 +41,7 @@ using System.Security;
#elif PORTABLE #elif PORTABLE
[assembly: AssemblyTitle("Json.NET Portable")] [assembly: AssemblyTitle("Json.NET Portable")]
#elif NETFX_CORE #elif NETFX_CORE
[assembly: AssemblyTitle("Json.NET Metro")] [assembly: AssemblyTitle("Json.NET WinRT")]
#elif NET20 #elif NET20
[assembly: AssemblyTitle("Json.NET .NET 2.0")] [assembly: AssemblyTitle("Json.NET .NET 2.0")]
[assembly: AllowPartiallyTrustedCallers] [assembly: AllowPartiallyTrustedCallers]
@@ -90,7 +90,7 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("4.5.0.0")] [assembly: AssemblyVersion("4.5.0.0")]
#if !PocketPC #if !PocketPC
[assembly: AssemblyFileVersion("4.5.8.15301")] [assembly: AssemblyFileVersion("4.5.9.15307")]
#endif #endif
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]