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

-Fixed build

Browse Source
This commit is contained in:
James Newton-King
2014-09-10 20:25:35 +12:00
parent a0f9df8a14
commit 7fcd12e2cf
8 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj
+5
View File
@@ -333,6 +333,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="SpaceShipV2.baemf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj
+3
View File
@@ -344,6 +344,9 @@
<LastGenOutput>LinqToSqlClasses.designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</None>
<Content Include="SpaceShipV2.baemf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj
+3
View File
@@ -529,6 +529,9 @@
<None Include="Schema\Specs\uniqueItems.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Content Include="SpaceShipV2.baemf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj
+6
View File
@@ -338,6 +338,7 @@
</ItemGroup>
<ItemGroup>
<Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Content Include="bunny_pancake.jpg">
@@ -373,6 +374,11 @@
<Name>Newtonsoft.Json.Portable</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="SpaceShipV2.baemf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj
+5
View File
@@ -381,6 +381,11 @@
<Name>Newtonsoft.Json.Portable40</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="SpaceShipV2.baemf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -75,4 +75,4 @@ using System.Security;
// by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.5.17707")]
[assembly: AssemblyFileVersion("6.0.5.17710")]
Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
+7 -5
View File
@@ -7496,19 +7496,21 @@ To fix this error either change the environment to be fully trusted, change the
{
Pair<string, int> p = new Pair<string, int>("One", 2);
string json = JsonConvert.SerializeObject(p);
Assert.AreEqual(@"{""First"":""One"",""Second"":2}", json);
#if !(NETFX_CORE || PORTABLE || PORTABLE40)
DefaultContractResolver r = new DefaultContractResolver();
r.IgnoreSerializableAttribute = false;
string json = JsonConvert.SerializeObject(p, new JsonSerializerSettings
json = JsonConvert.SerializeObject(p, new JsonSerializerSettings
{
ContractResolver = r
});
Assert.AreEqual(@"{""First"":""One"",""Second"":2}", json);
json = JsonConvert.SerializeObject(p);
Assert.AreEqual(@"{""First"":""One"",""Second"":2}", json);
#endif
}
[Test]
Src/Newtonsoft.Json/Properties/AssemblyInfo.cs
+1 -1
View File
@@ -91,5 +91,5 @@ using System.Security;
// by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.5.17707")]
[assembly: AssemblyFileVersion("6.0.5.17710")]
[assembly: CLSCompliant(true)]