-Fixed WinRT build
This commit is contained in:
@@ -1,54 +1,29 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<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="c15d5e96-7d57-4336-ae9e-a1a4e6ac522a"
|
|
||||||
Publisher="CN=James"
|
|
||||||
Version="1.0.0.0" />
|
|
||||||
|
|
||||||
<Properties>
|
<Properties>
|
||||||
<DisplayName>Newtonsoft.Json.Tests.Metro</DisplayName>
|
<DisplayName>Newtonsoft.Json.Tests.Metro</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.Metro</Description>
|
||||||
</Properties>
|
</Properties>
|
||||||
|
|
||||||
<Prerequisites>
|
<Prerequisites>
|
||||||
<OSMinVersion>6.2</OSMinVersion>
|
<OSMinVersion>6.2</OSMinVersion>
|
||||||
<OSMaxVersionTested>6.2</OSMaxVersionTested>
|
<OSMaxVersionTested>6.2</OSMaxVersionTested>
|
||||||
</Prerequisites>
|
</Prerequisites>
|
||||||
|
|
||||||
<Resources>
|
<Resources>
|
||||||
<Resource Language="x-generate"/>
|
<Resource Language="x-generate" />
|
||||||
</Resources>
|
</Resources>
|
||||||
|
|
||||||
<Applications>
|
<Applications>
|
||||||
<Application Id="vstest.executionengine.App"
|
<Application Id="vstest.executionengine.App" Executable="vstest.executionengine.appcontainer.exe" EntryPoint="vstest.executionengine.App">
|
||||||
Executable="vstest.executionengine.appcontainer.exe"
|
<VisualElements DisplayName="NoUIEntryPoints" Logo="Images\UnitTestLogo.png" SmallLogo="Images\UnitTestSmallLogo.png" Description="vstest.executionengine.App" ForegroundText="light" BackgroundColor="#0084FF">
|
||||||
EntryPoint="vstest.executionengine.App">
|
<SplashScreen Image="Images\UnitTestSplashScreen.png" />
|
||||||
<VisualElements
|
</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>
|
||||||
|
<Application Id="vstest.executionengine.x86.App" Executable="vstest.executionengine.appcontainer.x86.exe" EntryPoint="vstest.executionengine.x86.App">
|
||||||
<Application Id="vstest.executionengine.x86.App"
|
<VisualElements DisplayName="NoUIEntryPoints" Logo="Images\UnitTestLogo.png" SmallLogo="Images\UnitTestSmallLogo.png" Description="vstest.executionengine.x86.App" ForegroundText="light" BackgroundColor="#0084FF">
|
||||||
Executable="vstest.executionengine.appcontainer.x86.exe"
|
<SplashScreen Image="Images\UnitTestSplashScreen.png" />
|
||||||
EntryPoint="vstest.executionengine.x86.App">
|
</VisualElements>
|
||||||
<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>
|
</Application>
|
||||||
</Applications>
|
</Applications>
|
||||||
|
</Package>
|
||||||
</Package>
|
|
||||||
@@ -1018,10 +1018,10 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
public static object GetDefaultValue(Type type)
|
public static object GetDefaultValue(Type type)
|
||||||
{
|
{
|
||||||
if (!type.IsValueType)
|
if (!type.IsValueType())
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
switch (Type.GetTypeCode(type))
|
switch (ConvertUtils.GetTypeCode(type))
|
||||||
{
|
{
|
||||||
case TypeCode.Boolean:
|
case TypeCode.Boolean:
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user