LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Fixed WinRT build

Browse Source
This commit is contained in:
James Newton-King
2012-08-31 21:06:22 -07:00
parent 0714c05e6f
commit d63099f5da
2 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/Package.appxmanifest
+11 -36
View File
@@ -1,54 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
<Identity Name="c15d5e96-7d57-4336-ae9e-a1a4e6ac522a"
Publisher="CN=James"
Version="1.0.0.0" />
<Identity Name="A8B0D936-59D4-42B2-8044-E3920F5398BD" Publisher="CN=James" Version="1.0.0.0" />
<Properties>
<DisplayName>Newtonsoft.Json.Tests.Metro</DisplayName>
<PublisherDisplayName>James</PublisherDisplayName>
<Logo>Images\UnitTestStoreLogo.png</Logo>
<Description>Newtonsoft.Json.Tests.Metro</Description>
</Properties>
<Prerequisites>
<OSMinVersion>6.2</OSMinVersion>
<OSMaxVersionTested>6.2</OSMaxVersionTested>
</Prerequisites>
<Resources>
<Resource Language="x-generate"/>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application Id="vstest.executionengine.App"
Executable="vstest.executionengine.appcontainer.exe"
EntryPoint="vstest.executionengine.App">
<VisualElements
DisplayName="NoUIEntryPoints"
Logo="Images\UnitTestLogo.png"
SmallLogo="Images\UnitTestSmallLogo.png"
Description="vstest.executionengine.App"
ForegroundText="light"
BackgroundColor="#0084FF">
<SplashScreen Image="Images\UnitTestSplashScreen.png" />
</VisualElements>
<Application Id="vstest.executionengine.App" Executable="vstest.executionengine.appcontainer.exe" EntryPoint="vstest.executionengine.App">
<VisualElements DisplayName="NoUIEntryPoints" Logo="Images\UnitTestLogo.png" SmallLogo="Images\UnitTestSmallLogo.png" Description="vstest.executionengine.App" ForegroundText="light" BackgroundColor="#0084FF">
<SplashScreen Image="Images\UnitTestSplashScreen.png" />
</VisualElements>
</Application>
<Application Id="vstest.executionengine.x86.App"
Executable="vstest.executionengine.appcontainer.x86.exe"
EntryPoint="vstest.executionengine.x86.App">
<VisualElements
DisplayName="NoUIEntryPoints"
Logo="Images\UnitTestLogo.png"
SmallLogo="Images\UnitTestSmallLogo.png"
Description="vstest.executionengine.x86.App"
ForegroundText="light"
BackgroundColor="#0084FF">
<SplashScreen Image="Images\UnitTestSplashScreen.png" />
</VisualElements>
<Application Id="vstest.executionengine.x86.App" Executable="vstest.executionengine.appcontainer.x86.exe" EntryPoint="vstest.executionengine.x86.App">
<VisualElements DisplayName="NoUIEntryPoints" Logo="Images\UnitTestLogo.png" SmallLogo="Images\UnitTestSmallLogo.png" Description="vstest.executionengine.x86.App" ForegroundText="light" BackgroundColor="#0084FF">
<SplashScreen Image="Images\UnitTestSplashScreen.png" />
</VisualElements>
</Application>
</Applications>
</Package>
</Package>
Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs
+2 -2
View File
@@ -1018,10 +1018,10 @@ namespace Newtonsoft.Json.Utilities
public static object GetDefaultValue(Type type)
{
if (!type.IsValueType)
if (!type.IsValueType())
return null;
switch (Type.GetTypeCode(type))
switch (ConvertUtils.GetTypeCode(type))
{
case TypeCode.Boolean:
return false;