-Fixed build
This commit is contained in:
@@ -201,6 +201,7 @@
|
|||||||
<Compile Include="TestObjects\ConverableMembers.cs" />
|
<Compile Include="TestObjects\ConverableMembers.cs" />
|
||||||
<Compile Include="TestObjects\ConverterPrecedenceClass.cs" />
|
<Compile Include="TestObjects\ConverterPrecedenceClass.cs" />
|
||||||
<Compile Include="TestObjects\ConverterPrecedenceClassConverter.cs" />
|
<Compile Include="TestObjects\ConverterPrecedenceClassConverter.cs" />
|
||||||
|
<Compile Include="TestObjects\CustomerDataSet.cs" />
|
||||||
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
||||||
<Compile Include="TestObjects\DateTimeTestClass.cs" />
|
<Compile Include="TestObjects\DateTimeTestClass.cs" />
|
||||||
<Compile Include="TestObjects\DefaultValueAttributeTestClass.cs" />
|
<Compile Include="TestObjects\DefaultValueAttributeTestClass.cs" />
|
||||||
|
|||||||
@@ -1,4 +1,30 @@
|
|||||||
using System;
|
#region License
|
||||||
|
// Copyright (c) 2007 James Newton-King
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person
|
||||||
|
// obtaining a copy of this software and associated documentation
|
||||||
|
// files (the "Software"), to deal in the Software without
|
||||||
|
// restriction, including without limitation the rights to use,
|
||||||
|
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the
|
||||||
|
// Software is furnished to do so, subject to the following
|
||||||
|
// conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be
|
||||||
|
// included in all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#if !(SILVERLIGHT || NETFX_CORE || PORTABLE40 || PORTABLE)
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
@@ -693,3 +719,4 @@ namespace Newtonsoft.Json.Tests.TestObjects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
@@ -61,7 +61,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
assembly = Assembly.Load(assemblyName);
|
assembly = Assembly.Load(assemblyName);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !(PORTABLE40 || PORTABLE)
|
#if !(PORTABLE40 || PORTABLE || NETFX_CORE)
|
||||||
if (assembly == null)
|
if (assembly == null)
|
||||||
{
|
{
|
||||||
// will find assemblies loaded with Assembly.LoadFile outside of the main directory
|
// will find assemblies loaded with Assembly.LoadFile outside of the main directory
|
||||||
|
|||||||
Reference in New Issue
Block a user