Skip to content

Commit 8dc99c5

Browse files
author
邹嵩
committed
修正net45下一个缺失引用的错误
1 parent 48052c6 commit 8dc99c5

File tree

8 files changed

+19
-4
lines changed

8 files changed

+19
-4
lines changed

nuget/DotnetSpider.Core.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
<id>DotnetSpider.Core</id>
5-
<version>2.6.0-beta5</version>
5+
<version>2.6.0-beta7</version>
66
<authors>[email protected];Walterwhatwater;</authors>
77
<owners>[email protected]</owners>
88
<iconUrl>https://github.com/zlzforever/DotnetSpider/blob/master/images/icon.png?raw=true</iconUrl>

src/DotnetSpider.Core.Test/Downloader/HttpClientDownloaderTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void SetTimeout()
143143
{
144144
HttpClientDownloader downloader = new HttpClientDownloader();
145145
var entry = HttpClientDownloader.HttpClientPool.GetHttpClient("a");
146-
downloader.PrepareHttpClient(entry);
146+
downloader.PrepareHttpClient(entry, null);
147147
Assert.Equal(8, entry.Client.Timeout.TotalSeconds);
148148
}
149149
}

src/DotnetSpider.Core/Selector/CssSelector.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Linq;
34
using HtmlAgilityPack;
45
#if NETSTANDARD

src/DotnetSpider.Sample/DotnetSpider.Sample.projitems

+1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,6 @@
4646
<Compile Include="$(MSBuildThisFileDirectory)OcrDemo.cs" />
4747
<Compile Include="$(MSBuildThisFileDirectory)Program.cs" />
4848
<Compile Include="$(MSBuildThisFileDirectory)docs\RegexSelectorSpider.cs" />
49+
<Compile Include="$(MSBuildThisFileDirectory)TestSpider.cs" />
4950
</ItemGroup>
5051
</Project>

src/DotnetSpider.Sample/Program.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ public static void Main(string[] args)
2626
ThreadPool.SetMinThreads(200, 200);
2727
OcrDemo.Process();
2828
#endif
29-
3029
TestSpider spider = new TestSpider();
3130
spider.Run();
31+
32+
3233
}
3334

3435

src/netfx4.5/DotnetSpider.Core.Test/DotnetSpider.Core.Test.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@
4141
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4242
<HintPath>..\..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4343
</Reference>
44+
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
45+
<HintPath>..\..\..\packages\Serilog.2.3.0\lib\net45\Serilog.dll</HintPath>
46+
</Reference>
47+
<Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
48+
<HintPath>..\..\..\packages\Serilog.Sinks.File.3.2.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
49+
</Reference>
50+
<Reference Include="Serilog.Sinks.RollingFile, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
51+
<HintPath>..\..\..\packages\Serilog.Sinks.RollingFile.3.3.0\lib\net45\Serilog.Sinks.RollingFile.dll</HintPath>
52+
</Reference>
4453
<Reference Include="System" />
4554
<Reference Include="System.ComponentModel.Composition" />
4655
<Reference Include="System.Core" />

src/netfx4.5/DotnetSpider.Core.Test/packages.config

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<package id="Microsoft.NETCore.Platforms" version="2.1.0" targetFramework="net451" />
44
<package id="NETStandard.Library" version="2.0.3" targetFramework="net451" />
55
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
6+
<package id="Serilog" version="2.3.0" targetFramework="net451" />
7+
<package id="Serilog.Sinks.File" version="3.2.0" targetFramework="net451" />
8+
<package id="Serilog.Sinks.RollingFile" version="3.3.0" targetFramework="net451" />
69
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
710
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
811
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />

0 commit comments

Comments
 (0)