Skip to content

Commit b46351e

Browse files
darrylwhitmoredarrylwhitmore
committed
Merge branch 'feature/0.4.1_point_release' into develop
2 parents 4783208 + 15934be commit b46351e

File tree

370 files changed

+1670
-1158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

370 files changed

+1670
-1158
lines changed

‎Help/NScrape.shfbproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DocumentationSource sourceFile="..\NScrape\bin\Debug\netstandard2.0\NScrape.xml" />
2323
</DocumentationSources>
2424
<HelpFileFormat>Website</HelpFileFormat>
25-
<SyntaxFilters>C#, Visual Basic, Managed C++</SyntaxFilters>
25+
<SyntaxFilters>Standard</SyntaxFilters>
2626
<PresentationStyle>VS2013</PresentationStyle>
2727
<CleanIntermediates>True</CleanIntermediates>
2828
<KeepLogFile>True</KeepLogFile>
@@ -36,13 +36,14 @@
3636
<RootNamespaceContainer>False</RootNamespaceContainer>
3737
<NamespaceGrouping>True</NamespaceGrouping>
3838
<Preliminary>False</Preliminary>
39-
<CopyrightText>Copyright &amp;#169%3b Darryl G. Whitmore 2008-2018</CopyrightText>
39+
<CopyrightText>Copyright &amp;#169%3b Darryl G. Whitmore 2008-2019</CopyrightText>
4040
<SdkLinkTarget>Blank</SdkLinkTarget>
4141
<NamespaceSummaries>
4242
<NamespaceSummaryItem name="NScrape" isDocumented="True">The &lt;b&gt;NScrape&lt;/b&gt; namespace contains the types that provide core framework functionality.</NamespaceSummaryItem>
43-
<NamespaceSummaryItem name="NScrape.Forms" isDocumented="True">The &lt;b&gt;NScrape.Forms&lt;/b&gt; namespace contains the types that provide HTML form handling functionality.</NamespaceSummaryItem>
44-
<NamespaceSummaryItem name="(global)" isDocumented="False" />
45-
<NamespaceSummaryItem name="NScrape (Group)" isGroup="True" isDocumented="True">NScrape types are grouped into the following namespaces.</NamespaceSummaryItem></NamespaceSummaries>
43+
<NamespaceSummaryItem name="NScrape.Forms" isDocumented="True">The &lt;b&gt;NScrape.Forms&lt;/b&gt; namespace contains the types that provide HTML form handling functionality.</NamespaceSummaryItem>
44+
<NamespaceSummaryItem name="(global)" isDocumented="False" />
45+
<NamespaceSummaryItem name="NScrape (Group)" isGroup="True" isDocumented="True">NScrape types are grouped into the following namespaces.</NamespaceSummaryItem>
46+
</NamespaceSummaries>
4647
<ProjectSummary>
4748
</ProjectSummary>
4849
<RootNamespaceTitle>
@@ -80,13 +81,13 @@
8081
</PropertyGroup>
8182
<ItemGroup>
8283
<Reference Include="HtmlAgilityPack">
83-
<HintPath>..\packages\HtmlAgilityPack.1.7.2\lib\Net45\HtmlAgilityPack.dll</HintPath>
84+
<HintPath>..\packages\HtmlAgilityPack.1.9.1\lib\Net45\HtmlAgilityPack.dll</HintPath>
8485
</Reference>
8586
<Reference Include="Sprache.Signed">
86-
<HintPath>..\packages\Sprache.Signed.2.1.2\lib\net45\Sprache.Signed.dll</HintPath>
87+
<HintPath>..\packages\Sprache.Signed.2.2.0\lib\net45\Sprache.Signed.dll</HintPath>
8788
</Reference>
8889
<Reference Include="System.Drawing.Common">
89-
<HintPath>..\packages\System.Drawing.Common.4.5.0-preview1-26216-02\lib\net461\System.Drawing.Common.dll</HintPath>
90+
<HintPath>..\packages\System.Drawing.Common.4.5.1\lib\netstandard2.0\System.Drawing.Common.dll</HintPath>
9091
</Reference>
9192
</ItemGroup>
9293
</Project>

‎NScrape.Test.Common/WebResponseTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void HtmlWebResponseTest() {
110110
Assert.NotNull( htmlWebResponse );
111111

112112
Assert.NotNull( htmlWebResponse.Html );
113-
Assert.Contains( "\"NScrape - A web scraping framework for .NET\"", htmlWebResponse.Html );
113+
Assert.Contains( "A web scraping framework for .NET", htmlWebResponse.Html );
114114
}
115115
}
116116

‎NScrape.Test.Core/NScrape.Test.Core.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
27-
<PackageReference Include="System.Drawing.Common" Version="4.5.0-preview1-26216-02" />
28-
<PackageReference Include="xunit" Version="2.3.1" />
29-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0" />
27+
<PackageReference Include="System.Drawing.Common" Version="4.5.1" />
28+
<PackageReference Include="xunit" Version="2.4.1" />
29+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
30+
<PrivateAssets>all</PrivateAssets>
31+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
32+
</PackageReference>
3033
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
3134
</ItemGroup>
3235

‎NScrape.Test.Framework/NScrape.Test.Framework.csproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\xunit.core.2.4.0-beta.1.build3958\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.0-beta.1.build3958\build\xunit.core.props')" />
3+
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -39,17 +39,17 @@
3939
<AssemblyOriginatorKeyFile>nscrape.snk</AssemblyOriginatorKeyFile>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="HtmlAgilityPack, Version=1.7.2.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
43-
<HintPath>..\packages\HtmlAgilityPack.1.7.2\lib\Net45\HtmlAgilityPack.dll</HintPath>
42+
<Reference Include="HtmlAgilityPack, Version=1.9.1.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
43+
<HintPath>..\packages\HtmlAgilityPack.1.9.1\lib\Net45\HtmlAgilityPack.dll</HintPath>
4444
</Reference>
45-
<Reference Include="Sprache.Signed, Version=2.1.2.0, Culture=neutral, PublicKeyToken=57f43ee1809c4ea6, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Sprache.Signed.2.1.2\lib\net45\Sprache.Signed.dll</HintPath>
45+
<Reference Include="Sprache.Signed, Version=2.2.0.0, Culture=neutral, PublicKeyToken=57f43ee1809c4ea6, processorArchitecture=MSIL">
46+
<HintPath>..\packages\Sprache.Signed.2.2.0\lib\net45\Sprache.Signed.dll</HintPath>
4747
</Reference>
4848
<Reference Include="System" />
4949
<Reference Include="System.Core" />
5050
<Reference Include="System.Drawing" />
51-
<Reference Include="System.Drawing.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
52-
<HintPath>..\packages\System.Drawing.Common.4.5.0-preview1-26216-02\lib\net461\System.Drawing.Common.dll</HintPath>
51+
<Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
52+
<HintPath>..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
5353
</Reference>
5454
<Reference Include="System.Xml.Linq" />
5555
<Reference Include="System.Data.DataSetExtensions" />
@@ -58,16 +58,16 @@
5858
<Reference Include="System.Net.Http" />
5959
<Reference Include="System.Xml" />
6060
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
61-
<HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
61+
<HintPath>..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
6262
</Reference>
63-
<Reference Include="xunit.assert, Version=2.4.0.3958, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
64-
<HintPath>..\packages\xunit.assert.2.4.0-beta.1.build3958\lib\netstandard1.1\xunit.assert.dll</HintPath>
63+
<Reference Include="xunit.assert, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
64+
<HintPath>..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
6565
</Reference>
66-
<Reference Include="xunit.core, Version=2.4.0.3958, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
67-
<HintPath>..\packages\xunit.extensibility.core.2.4.0-beta.1.build3958\lib\netstandard1.1\xunit.core.dll</HintPath>
66+
<Reference Include="xunit.core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
67+
<HintPath>..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll</HintPath>
6868
</Reference>
69-
<Reference Include="xunit.execution.desktop, Version=2.4.0.3958, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
70-
<HintPath>..\packages\xunit.extensibility.execution.2.4.0-beta.1.build3958\lib\net452\xunit.execution.desktop.dll</HintPath>
69+
<Reference Include="xunit.execution.desktop, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
70+
<HintPath>..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
7171
</Reference>
7272
</ItemGroup>
7373
<ItemGroup>
@@ -109,9 +109,6 @@
109109
<None Include="nscrape.snk" />
110110
<None Include="packages.config" />
111111
</ItemGroup>
112-
<ItemGroup>
113-
<Analyzer Include="..\packages\xunit.analyzers.0.8.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
114-
</ItemGroup>
115112
<ItemGroup>
116113
<EmbeddedResource Include="Properties\Resources.resx">
117114
<Generator>ResXFileCodeGenerator</Generator>
@@ -133,13 +130,16 @@
133130
<ItemGroup>
134131
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
135132
</ItemGroup>
133+
<ItemGroup>
134+
<Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
135+
</ItemGroup>
136136
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
137137
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
138138
<PropertyGroup>
139139
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
140140
</PropertyGroup>
141-
<Error Condition="!Exists('..\packages\xunit.core.2.4.0-beta.1.build3958\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.0-beta.1.build3958\build\xunit.core.props'))" />
142-
<Error Condition="!Exists('..\packages\xunit.core.2.4.0-beta.1.build3958\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.0-beta.1.build3958\build\xunit.core.targets'))" />
141+
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
142+
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
143143
</Target>
144-
<Import Project="..\packages\xunit.core.2.4.0-beta.1.build3958\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.0-beta.1.build3958\build\xunit.core.targets')" />
144+
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
145145
</Project>

‎NScrape.Test.Framework/packages.config‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HtmlAgilityPack" version="1.7.2" targetFramework="net461" />
4-
<package id="Sprache.Signed" version="2.1.2" targetFramework="net461" />
5-
<package id="System.Drawing.Common" version="4.5.0-preview1-26216-02" targetFramework="net461" />
6-
<package id="xunit" version="2.4.0-beta.1.build3958" targetFramework="net461" />
7-
<package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
8-
<package id="xunit.analyzers" version="0.8.0" targetFramework="net461" />
9-
<package id="xunit.assert" version="2.4.0-beta.1.build3958" targetFramework="net461" />
10-
<package id="xunit.core" version="2.4.0-beta.1.build3958" targetFramework="net461" />
11-
<package id="xunit.extensibility.core" version="2.4.0-beta.1.build3958" targetFramework="net461" />
12-
<package id="xunit.extensibility.execution" version="2.4.0-beta.1.build3958" targetFramework="net461" />
3+
<package id="HtmlAgilityPack" version="1.9.1" targetFramework="net461" />
4+
<package id="Sprache.Signed" version="2.2.0" targetFramework="net461" />
5+
<package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
6+
<package id="xunit" version="2.4.1" targetFramework="net461" />
7+
<package id="xunit.abstractions" version="2.0.3" targetFramework="net461" />
8+
<package id="xunit.analyzers" version="0.10.0" targetFramework="net461" />
9+
<package id="xunit.assert" version="2.4.1" targetFramework="net461" />
10+
<package id="xunit.core" version="2.4.1" targetFramework="net461" />
11+
<package id="xunit.extensibility.core" version="2.4.1" targetFramework="net461" />
12+
<package id="xunit.extensibility.execution" version="2.4.1" targetFramework="net461" />
1313
</packages>

‎NScrape/NScrape.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<AssemblyVersion>0.4.0.0</AssemblyVersion>
6-
<FileVersion>0.4.0.0</FileVersion>
5+
<AssemblyVersion>0.4.1.0</AssemblyVersion>
6+
<FileVersion>0.4.1.0</FileVersion>
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>nscrape.snk</AssemblyOriginatorKeyFile>
99
<PackageId>NScrape</PackageId>
1010
<title>NScrape Web Scraping Framework</title>
11-
<Version>0.4.0.0</Version>
11+
<Version>0.4.1.0</Version>
1212
<Authors>Darryl G. Whitmore</Authors>
1313
<Company>Darryl G. Whitmore</Company>
14-
<Description>A web scraping framework for .Net</Description>
15-
<Copyright>2008-2018</Copyright>
14+
<Description>A web scraping framework for .NET</Description>
15+
<Copyright>2008-2019</Copyright>
1616
<PackageLicenseUrl>https://raw.githubusercontent.com/darrylwhitmore/NScrape/master/LICENSE</PackageLicenseUrl>
1717
<PackageProjectUrl>https://github.com/darrylwhitmore/NScrape</PackageProjectUrl>
1818
<PackageIconUrl>https://raw.githubusercontent.com/darrylwhitmore/NScrape/master/Assets/NScrape.png</PackageIconUrl>
1919
<PackageTags>html scrape scraper scraping crawler crawling htmlagilitypack htmlagility agility</PackageTags>
2020
<Product>NScrape Web Scraping Framework</Product>
21-
<PackageReleaseNotes>For this release, NScape has been converted to a .NET Standard 2.0 library. In addition, the API reference has been moved from a standalone CHM file to the new NScrape.com GitHub Pages website.</PackageReleaseNotes>
21+
<PackageReleaseNotes>Just a small package refresh, notably updating to the release version of System.Drawing.Common.</PackageReleaseNotes>
2222
</PropertyGroup>
2323

2424
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -34,9 +34,9 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<PackageReference Include="HtmlAgilityPack" Version="1.7.2" />
38-
<PackageReference Include="Sprache.Signed" Version="2.1.2" />
39-
<PackageReference Include="System.Drawing.Common" Version="4.5.0" />
37+
<PackageReference Include="HtmlAgilityPack" Version="1.9.1" />
38+
<PackageReference Include="Sprache.Signed" Version="2.2.0" />
39+
<PackageReference Include="System.Drawing.Common" Version="4.5.1" />
4040
</ItemGroup>
4141

4242
<ItemGroup>

0 commit comments

Comments
 (0)