-Upgrade System.Collections.Immutable

This commit is contained in:
James Newton-King
2014-12-22 22:11:22 +00:00
parent 5d34cedcb3
commit 25814e5a6c
6 changed files with 22 additions and 22 deletions
@@ -76,8 +76,9 @@
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath> <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Collections.Immutable"> <Reference Include="System.Collections.Immutable, Version=1.1.20.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.Immutable.1.1.20-beta\lib\portable-net45+win8\System.Collections.Immutable.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.ComponentModel.DataAnnotations"> <Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -42,9 +42,9 @@
<HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath> <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.1.20.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="System.Collections.Immutable, Version=1.1.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Bcl.Immutable.1.1.20-beta\lib\portable-net45+win8\System.Collections.Immutable.dll</HintPath> <HintPath>..\packages\System.Collections.Immutable.1.1.33-beta\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
@@ -427,7 +427,9 @@
<LastGenOutput>LinqToSqlClasses.designer.cs</LastGenOutput> <LastGenOutput>LinqToSqlClasses.designer.cs</LastGenOutput>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </None>
<None Include="packages.config" /> <None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="Schema\Specs\additionalItems.json"> <None Include="Schema\Specs\additionalItems.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
@@ -508,12 +510,6 @@
<Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" /> <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.csproj">
<Project>{eeea67f9-9089-481d-a4dc-0966dec9fd7d}</Project>
<Name>Newtonsoft.Json</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="bunny_pancake.jpg"> <Content Include="bunny_pancake.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -525,6 +521,12 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.csproj">
<Project>{eeea67f9-9089-481d-a4dc-0966dec9fd7d}</Project>
<Name>Newtonsoft.Json</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
@@ -152,12 +152,9 @@ namespace Newtonsoft.Json.Tests.Serialization
[Test] [Test]
public void SerializeDefaultArray() public void SerializeDefaultArray()
{ {
ExceptionAssert.Throws<NullReferenceException>( ExceptionAssert.Throws<InvalidOperationException>(
() => JsonConvert.SerializeObject(default(ImmutableArray<int>), Formatting.Indented), () => JsonConvert.SerializeObject(default(ImmutableArray<int>), Formatting.Indented),
new [] { "This operation cannot be performed on a default instance of ImmutableArray<T>. Consider initializing the array, or checking the ImmutableArray<T>.IsDefault property.");
"Object reference not set to an instance of an object.",
"Object reference not set to an instance of an object" // mono
});
} }
#endregion #endregion
+3 -3
View File
@@ -262,9 +262,9 @@ namespace Newtonsoft.Json.Tests
#endif #endif
{ {
#if !NETFX_CORE #if !NETFX_CORE
// CultureInfo turkey = CultureInfo.CreateSpecificCulture("tr"); //CultureInfo turkey = CultureInfo.CreateSpecificCulture("tr");
// Thread.CurrentThread.CurrentCulture = turkey; //Thread.CurrentThread.CurrentCulture = turkey;
// Thread.CurrentThread.CurrentUICulture = turkey; //Thread.CurrentThread.CurrentUICulture = turkey;
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture; Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
+1 -1
View File
@@ -2,6 +2,6 @@
<packages> <packages>
<package id="Autofac" version="3.5.0" targetFramework="net45" /> <package id="Autofac" version="3.5.0" targetFramework="net45" />
<package id="FSharp.Core" version="4.0.0" targetFramework="net45" /> <package id="FSharp.Core" version="4.0.0" targetFramework="net45" />
<package id="Microsoft.Bcl.Immutable" version="1.1.20-beta" targetFramework="net45" />
<package id="NUnit" version="2.6.2" targetFramework="net45" /> <package id="NUnit" version="2.6.2" targetFramework="net45" />
<package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
</packages> </packages>
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources> <packageSources>
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" /> <clear />
<add key="NuGet.org" value="https://nuget.org/api/v2/" /> <add key="Offical NuGet.org" value="https://nuget.org/api/v2/" />
</packageSources> </packageSources>
</configuration> </configuration>