Merge pull request #18 from AngleSharp/devel

Release of v0.10

Author: FlorianRappl

.editorconfig

@@ -1,13 +1,13 @@
-# http://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-
-[*.csproj]
-indent_style = space
-indent_size = 2
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.csproj]
+indent_style = space
+indent_size = 2

.gitignore

@@ -27,6 +27,17 @@ local.properties
 # PDT-specific
 .buildpath
 
+################
+## Rider
+################
+
+.idea/
+
+################
+## VS Code
+################
+
+.vscode/
 
 #################
 ## Visual Studio
@@ -38,22 +49,34 @@ local.properties
 # User-specific files
 *.suo
 *.user
+*.userosscache
 *.sln.docstates
 
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
 # Build results
 [Dd]ebug/
 [Rr]elease/
 [Bb]in/
 [Bb]uild/
 [Oo]bj/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+
+# DNX
+*.lock.json
+artifacts/
+
 [Dd]ebug/
 [Rr]elease/
 [Pp]ackages/
 [Tt]ools/
 ![Tt]ools/packages.config
-AngleSharp.sln.ide/
-AngleSharp.Core.sln.ide/
 TestResults/
+*.nuget.targets
+*.nuget.props
 *.nupkg
 *_i.c
 *_p.c

CHANGELOG.md

@@ -1,24 +1,40 @@
+# 0.10.0
+
+Released on Friday, January 4 2019.
+
+- Updated to fit the latest version of AngleSharp
+
 # 0.3.2
 
+Released on Saturday, September 3 2016.
+
 - Updated to latest version
 - Dispose WebSocket on unload
 - Added `about:` handler
 
 # 0.3.1
 
+Released on Sunday, July 17 2016.
+
 - Adjusted to service changes
 
 # 0.3.0
 
+Released on Friday, May 6 2016.
+
 - Added a File requester (#11)
 - Added a FTP requester (#10)
 
 # 0.2.0
 
+Released on Tuesday, January 5 2016.
+
 - Fixed compatibility bug (#7)
 - Added WebSocket interface (#5)
 - `IRequester` flexibility (#1)
 
 # 0.1.0
 
-- Initial release (#4, #3)
+Released on Sunday, October 18 2015.
+
+- Initial release (#4, #3)

CONTRIBUTORS.md

@@ -0,0 +1,12 @@
+# AngleSharp.Io Contributors
+
+Thanks :heart: to all who contributed to AngleSharp.Css via issues, pull requests, suggestions, and questions.
+
+AngleSharp.Io contains code written by (in order of first pull request / commit):
+
+* [Florian Rappl](https://github.com/FlorianRappl)
+* [Joel Verhagen](https://github.com/joelverhagen)
+
+Without these awesome people AngleSharp.Io could not exist. Thanks to everyone for your contributions! :beers:
+
+Missing you? Please contact us! Potentially, the simplest way is to file a PR with your name / GitHub profile link added to this file.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 AngleSharp
+Copyright (c) 2015 - 2019 AngleSharp
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,24 +1,50 @@
 ![logo](https://raw.githubusercontent.com/AngleSharp/AngleSharp.Io/master/header.png)
 
-AngleSharp.Io
-=============
+# AngleSharp.Io
 
-AngleSharp.Io extends AngleSharp with powerful requesters, caching mechanisms, and storage systems. It is coupled more strongly to the underlying operating system than AngleSharp itself. Therefore it has stronger dependencies and demands and cannot be released as a PCL.
+[![Build Status](https://img.shields.io/appveyor/ci/FlorianRappl/AngleSharp-Io.svg?style=flat-square)](https://ci.appveyor.com/project/FlorianRappl/AngleSharp-Io)
+[![GitHub Tag](https://img.shields.io/github/tag/AngleSharp/AngleSharp.Io.svg?style=flat-square)](https://github.com/AngleSharp/AngleSharp.Io/releases)
+[![NuGet Count](https://img.shields.io/nuget/dt/AngleSharp.Io.svg?style=flat-square)](https://www.nuget.org/packages/AngleSharp.Io/)
+[![Issues Open](https://img.shields.io/github/issues/AngleSharp/AngleSharp.Io.svg?style=flat-square)](https://github.com/AngleSharp/AngleSharp.Io/issues)
+[![StackOverflow Questions](https://img.shields.io/stackexchange/stackoverflow/t/anglesharp.svg?style=flat-square)](https://stackoverflow.com/tags/anglesharp)
+[![CLA Assistant](https://cla-assistant.io/readme/badge/AngleSharp/AngleSharp.Io?style=flat-square)](https://cla-assistant.io/AngleSharp/AngleSharp.Io)
 
-Current status of this repository:
+AngleSharp.Io extends AngleSharp with powerful requesters, caching mechanisms, and storage systems. It is coupled more strongly to the underlying operating system than AngleSharp itself. Therefore it has stronger dependencies and demands and cannot be released for the standard framework (4.6). Nevertheless, it is released as a .NET Standard 2.0 library.
 
-[![Build status](https://img.shields.io/appveyor/ci/FlorianRappl/AngleSharp-Io.svg?style=flat-square)](https://ci.appveyor.com/project/FlorianRappl/AngleSharp-Io)
-[![Issues open](https://img.shields.io/github/issues/AngleSharp/AngleSharp.Io.svg?style=flat-square)](https://github.com/AngleSharp/AngleSharp.Io/issues)
-[![Nuget count](https://img.shields.io/nuget/v/AngleSharp.Io.svg?style=flat-square)](https://www.nuget.org/packages/AngleSharp.Io/)
+## Basic Configuration
 
-**Status** Currently in experimental stage.
+If you just want to use *all* available requesters provided by AngleSharp.Io you can do the following:
 
-Some legal stuff
-----------------
+```cs
+var config = Configuration.Default
+    .WithRequesters() // from AngleSharp.Io
+    .WithDefaultLoader(); // from AngleSharp
+```
+
+This will register all requesters. Alternatively, the requesters can be provided explicitly. They are located in the `AngleSharp.Io.Network` namespace and have names such as `DataRequester`.
+
+## Features
+
+- New requesters
+  - HTTP (using `HttpClient`)
+  - FTP
+  - Supporting data URLs
+  - Supporting file URLs
+  - Enhanced support for about: URLs
+- WebSockets (mostly interesting for scripting engines, e.g., JS)
+- Storage support by providing the `IStorage` interface
+
+## Participating
+
+Participation in the project is highly welcome. For this project the same rules as for the AngleSharp core project may be applied.
+
+If you have any question, concern, or spot an issue then please report it before opening a pull request. An initial discussion is appreciated regardless of the nature of the problem.
+
+## License
 
 The MIT License (MIT)
 
-Copyright (c) 2015 - 2016 AngleSharp
+Copyright (c) 2015 - 2019 AngleSharp
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

build.cake

@@ -31,7 +31,7 @@ var nugetRoot = buildResultDir + Directory("nuget");
 // Initialization
 // ----------------------------------------
 
-Setup(() =>
+Setup(_ =>
 {
     Information("Building version {0} of AngleSharp.Io.", version);
     Information("For the publish target the following environment variables need to be set:");
@@ -51,57 +51,55 @@ Task("Restore-Packages")
     .IsDependentOn("Clean")
     .Does(() =>
     {
-        NuGetRestore("./src/AngleSharp.Io.sln");
+        NuGetRestore("./src/AngleSharp.Io.sln", new NuGetRestoreSettings {
+            ToolPath = "tools/nuget.exe"
+        });
     });
 
 Task("Build")
     .IsDependentOn("Restore-Packages")
     .Does(() =>
     {
-        if (isRunningOnWindows)
-        {
-            MSBuild("./src/AngleSharp.Io.sln", new MSBuildSettings()
-                .SetConfiguration(configuration)
-                .SetVerbosity(Verbosity.Minimal)
-            );
-        }
-        else
-        {
-            XBuild("./src/AngleSharp.Io.sln", new XBuildSettings()
-                .SetConfiguration(configuration)
-                .SetVerbosity(Verbosity.Minimal)
-            );
-        }
+        DotNetCoreBuild("./src/AngleSharp.Io.sln", new DotNetCoreBuildSettings() {
+           Configuration = configuration
+        });
     });
 
 Task("Run-Unit-Tests")
     .IsDependentOn("Build")
     .Does(() =>
     {
-        var settings = new NUnit3Settings
+        var settings = new DotNetCoreTestSettings
         {
-            Work = buildResultDir.Path.FullPath
+            Configuration = configuration
         };
 
         if (isRunningOnAppVeyor)
         {
-            settings.Where = "cat != ExcludeFromAppVeyor";
+            settings.TestAdapterPath = Directory(".");
+            settings.Logger = "Appveyor";
+            // TODO Finds a way to exclude tests not allowed to run on appveyor
+            // Not used in current code
+            //settings.Where = "cat != ExcludeFromAppVeyor";
         }
 
-        NUnit3("./src/**/bin/" + configuration + "/*.Tests.dll", settings);
+        DotNetCoreTest("./src/AngleSharp.Io.Tests/", settings);
     });
 
 Task("Copy-Files")
     .IsDependentOn("Build")
     .Does(() =>
     {
-        var target = nugetRoot + Directory("lib") + Directory("net45");
+        var framework = "netstandard2.0";
+        var target = nugetRoot + Directory("lib") + Directory(framework);
+
         CreateDirectory(target);
         CopyFiles(new FilePath[]
-        { 
-            buildDir + File("AngleSharp.Io.dll"),
-            buildDir + File("AngleSharp.Io.xml")
+        {
+            buildDir + Directory(framework) + File("AngleSharp.Io.dll"),
+            buildDir + Directory(framework) + File("AngleSharp.Io.xml")
         }, target);
+
         CopyFiles(new FilePath[] { "src/AngleSharp.Io.nuspec" }, nugetRoot);
     });
 
@@ -113,12 +111,12 @@ Task("Create-Package")
             ?? (isRunningOnAppVeyor ? GetFiles("C:\\Tools\\NuGet3\\nuget.exe").FirstOrDefault() : null);
 
         if (nugetExe == null)
-        {            
+        {
             throw new InvalidOperationException("Could not find nuget.exe.");
         }
-        
+
         var nuspec = nugetRoot + File("AngleSharp.Io.nuspec");
-        
+
         NuGetPack(nuspec, new NuGetPackSettings
         {
             Version = version,
@@ -127,7 +125,7 @@ Task("Create-Package")
             Properties = new Dictionary<String, String> { { "Configuration", configuration } }
         });
     });
-    
+
 Task("Publish-Package")
     .IsDependentOn("Create-Package")
     .WithCriteria(() => isLocal)
@@ -142,14 +140,14 @@ Task("Publish-Package")
 
         foreach (var nupkg in GetFiles(nugetRoot.Path.FullPath + "/*.nupkg"))
         {
-            NuGetPush(nupkg, new NuGetPushSettings 
-            { 
+            NuGetPush(nupkg, new NuGetPushSettings
+            {
                 Source = "https://nuget.org/api/v2/package",
-                ApiKey = apiKey 
+                ApiKey = apiKey
             });
         }
     });
-    
+
 Task("Publish-Release")
     .IsDependentOn("Publish-Package")
     .WithCriteria(() => isLocal)
@@ -176,28 +174,29 @@ Task("Publish-Release")
             TargetCommitish = "master"
         }).Wait();
     });
-    
+
 Task("Update-AppVeyor-Build-Number")
     .WithCriteria(() => isRunningOnAppVeyor)
     .Does(() =>
     {
-        AppVeyor.UpdateBuildVersion(version);
+        var num = AppVeyor.Environment.Build.Number;
+        AppVeyor.UpdateBuildVersion($"{version}-{num}");
     });
-    
+
 // Targets
 // ----------------------------------------
-    
+
 Task("Package")
     .IsDependentOn("Run-Unit-Tests")
     .IsDependentOn("Create-Package");
 
 Task("Default")
-    .IsDependentOn("Package");    
+    .IsDependentOn("Package");
 
 Task("Publish")
     .IsDependentOn("Publish-Package")
     .IsDependentOn("Publish-Release");
-    
+
 Task("AppVeyor")
     .IsDependentOn("Run-Unit-Tests")
     .IsDependentOn("Update-AppVeyor-Build-Number");