Skip to content

Commit eb2ce7a

Browse files
FlorianRapplFlorianRappl
committed
Updated to AngleSharp v0.9.7
1 parent 38d605c commit eb2ce7a

File tree

8 files changed

+19
-41
lines changed

8 files changed

+19
-41
lines changed

‎src/AngleSharp.Io.Tests/AngleSharp.Io.Tests.csproj

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,42 +36,22 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
40-
<HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
39+
<Reference Include="AngleSharp, Version=0.9.7.86, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
40+
<HintPath>..\packages\AngleSharp.0.9.7\lib\net45\AngleSharp.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="FluentAssertions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
44-
<HintPath>..\packages\FluentAssertions.4.5.0\lib\net45\FluentAssertions.dll</HintPath>
43+
<Reference Include="FluentAssertions, Version=4.12.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
44+
<HintPath>..\packages\FluentAssertions.4.12.0\lib\net45\FluentAssertions.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
47-
<Reference Include="FluentAssertions.Core, Version=4.5.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
48-
<HintPath>..\packages\FluentAssertions.4.5.0\lib\net45\FluentAssertions.Core.dll</HintPath>
47+
<Reference Include="FluentAssertions.Core, Version=4.12.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
48+
<HintPath>..\packages\FluentAssertions.4.12.0\lib\net45\FluentAssertions.Core.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
51-
<Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
54-
<Private>False</Private>
55-
</Reference>
56-
<Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
59-
<Private>False</Private>
60-
</Reference>
61-
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
62-
<HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
51+
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
52+
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
6353
<Private>True</Private>
6454
</Reference>
65-
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
68-
<Private>False</Private>
69-
</Reference>
70-
<Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
73-
<Private>False</Private>
74-
</Reference>
7555
<Reference Include="System" />
7656
<Reference Include="System.Net.Http" />
7757
<Reference Include="System.Xml" />

‎src/AngleSharp.Io.Tests/Network/FtpRequesterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public async Task FollowLinkToUseFtpRequesterUsingAllRequesters()
3434
var document = await context.OpenAsync(res => res.Content("<a href='ftp://ftp.funet.fi/pub/standards/RFC/rfc959.txt'>Download</a>"));
3535
var result = await document.QuerySelector<IHtmlAnchorElement>("a").NavigateAsync();
3636
var content = result.Body.TextContent;
37-
Assert.AreEqual(145730, content.Length);
37+
Assert.AreEqual(147316, content.Length);
3838
}
3939

4040
[Test]

‎src/AngleSharp.Io.Tests/Network/HttpClientRequesterTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using AngleSharp.Io.Network;
55
using AngleSharp.Io.Tests.Network.Mocks;
66
using AngleSharp.Network;
7-
using AngleSharp.Services.Default;
87
using FluentAssertions;
98
using NUnit.Framework;
109
using System;
@@ -125,7 +124,7 @@ public async Task EndToEnd()
125124
// ARRANGE
126125
var httpClient = new HttpClient();
127126
var requester = new HttpClientRequester(httpClient);
128-
var configuration = Configuration.Default.With(new LoaderService(new[] { requester }));
127+
var configuration = Configuration.Default.WithDefaultLoader(requesters: new[] { requester });
129128
var context = BrowsingContext.New(configuration);
130129
var request = DocumentRequest.Get(Url.Create("http://httpbin.org/html"));
131130

‎src/AngleSharp.Io.Tests/Network/Mocks/Request.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public Url Address
1919
set;
2020
}
2121

22-
public Dictionary<String, String> Headers
22+
public IDictionary<String, String> Headers
2323
{
2424
get;
2525
set;

‎src/AngleSharp.Io.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AngleSharp" version="0.9.6" targetFramework="net45" />
3+
<package id="AngleSharp" version="0.9.7" targetFramework="net45" />
44
<package id="FluentAssertions" version="4.12.0" targetFramework="net45" />
55
<package id="NUnit" version="3.4.1" targetFramework="net45" />
66
</packages>

‎src/AngleSharp.Io/AngleSharp.Io.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<DocumentationFile>bin\Release\AngleSharp.Io.xml</DocumentationFile>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
37-
<HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
36+
<Reference Include="AngleSharp, Version=0.9.7.86, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
37+
<HintPath>..\packages\AngleSharp.0.9.7\lib\net45\AngleSharp.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
4040
<Reference Include="System" />
@@ -47,7 +47,7 @@
4747
<Reference Include="System.Xml" />
4848
</ItemGroup>
4949
<ItemGroup>
50-
<Compile Include="ConfigurationExtensions.cs" />
50+
<Compile Include="IoConfigurationExtensions.cs" />
5151
<Compile Include="Dom\WebSocketReadyState.cs" />
5252
<Compile Include="Extensions\GeneralExtensions.cs" />
5353
<Compile Include="Dom\WebSocket.cs" />

‎src/AngleSharp.Io/ConfigurationExtensions.cs renamed to ‎src/AngleSharp.Io/IoConfigurationExtensions.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@
33
using AngleSharp.Io.Network;
44
using AngleSharp.Network;
55
using AngleSharp.Network.Default;
6-
using AngleSharp.Services.Default;
76
using System;
87
using System.Net.Http;
98

109
/// <summary>
1110
/// Additional extensions for improved requesters.
1211
/// </summary>
13-
public static class ConfigurationExtensions
12+
public static class IoConfigurationExtensions
1413
{
1514
/// <summary>
1615
/// Adds a loader service that comes with all (improved) requesters.
1716
/// </summary>
1817
/// <param name="configuration">The configuration to use.</param>
1918
/// <param name="setup">Optional setup for the loader service.</param>
2019
/// <returns>The new configuration.</returns>
21-
public static IConfiguration WithRequesters(this IConfiguration configuration, Action<LoaderService> setup = null)
20+
public static IConfiguration WithRequesters(this IConfiguration configuration, Action<ConfigurationExtensions.LoaderSetup> setup = null)
2221
{
2322
var requesters = new IRequester[] { new HttpClientRequester(), new DataRequester(), new FtpRequester(), new FileRequester() };
2423
return configuration.WithDefaultLoader(setup, requesters);
@@ -33,7 +32,7 @@ public static IConfiguration WithRequesters(this IConfiguration configuration, A
3332
/// </param>
3433
/// <param name="setup">Optional setup for the loader service.</param>
3534
/// <returns>The new configuration.</returns>
36-
public static IConfiguration WithRequesters(this IConfiguration configuration, HttpMessageHandler httpMessageHandler, Action<LoaderService> setup = null)
35+
public static IConfiguration WithRequesters(this IConfiguration configuration, HttpMessageHandler httpMessageHandler, Action<ConfigurationExtensions.LoaderSetup> setup = null)
3736
{
3837
var httpClient = new HttpClient(httpMessageHandler);
3938
var requesters = new IRequester[] { new HttpClientRequester(httpClient), new DataRequester(), new FtpRequester(), new FileRequester() };

‎src/AngleSharp.Io/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AngleSharp" version="0.9.6" targetFramework="net45" />
3+
<package id="AngleSharp" version="0.9.7" targetFramework="net45" />
44
</packages>

0 commit comments

Comments
 (0)