Skip to content

Commit be89082

Browse files
authoredJun 12, 2021
Merge pull request #79 from AngleSharp/devel
Release 0.15.0
2 parents 801aa30 + cf6ec72 commit be89082

25 files changed

+354
-107
lines changed
 

‎.github/CONTRIBUTING.md

+24-22
Original file line numberDiff line numberDiff line change
@@ -26,47 +26,50 @@ Discussion of issues should be placed transparently in the issue tracker here on
2626

2727
* [AngleSharp.Core](https://github.com/AngleSharp/AngleSharp/issues/)
2828
* [AngleSharp.Css](https://github.com/AngleSharp/AngleSharp.Css/issues/)
29+
* [AngleSharp.Diffing](https://github.com/AngleSharp/AngleSharp.Diffing/issues/)
2930
* [AngleSharp.Io](https://github.com/AngleSharp/AngleSharp.Io/issues/)
3031
* [AngleSharp.Js](https://github.com/AngleSharp/AngleSharp.Js/issues/)
3132
* [AngleSharp.Xml](https://github.com/AngleSharp/AngleSharp.Xml/issues/)
33+
* [AngleSharp.XPath](https://github.com/AngleSharp/AngleSharp.XPath/issues/)
34+
* [AngleSharp.Wasm](https://github.com/AngleSharp/AngleSharp.Wasm/issues/)
3235

3336
### Modifying the code
3437

3538
AngleSharp and its libraries uses features from the latest versions of C# (e.g., C# 7). You will therefore need a C# compiler that is up for the job.
3639

3740
1. Fork and clone the repo.
38-
2. First try to build the AngleSharp.Core libray and see if you get the tests running.
41+
2. First try to build the AngleSharp.Core library and see if you get the tests running.
3942
3. You will be required to resolve some dependencies via NuGet.
4043

4144
AngleSharp itself does not have dependencies, however, the tests are dependent on NUnit.
4245

43-
The build system of AngleSharp uses Cake. A bootstrap script (build.ps1 for Windows or build.sh for *nix systems) is included. Note, that at the moment AngleSharp may require NuGet 3.5, which looks for MSBuild pre-15, i.e., before Visual Studio 2017 on Windows systems. We aim to drop this requirement enitirely soon.
46+
The build system of AngleSharp uses Cake. A bootstrap script (build.ps1 for Windows or build.sh for *nix systems) is included. Note, that at the moment AngleSharp may require NuGet 3.5, which looks for MSBuild pre-15, i.e., before Visual Studio 2017 on Windows systems. We aim to drop this requirement entirely soon.
4447

4548
### Code Conventions
4649

4750
Most parts in the AngleSharp project are fairly straight forward. Among these are:
4851

49-
- Always use statement blocks for control statements, e.g., in a for-loop, if-condition, ...
50-
- You may use a simple (throw) statement in case of enforcing contracts on argument
51-
- Be explicit about modifiers (some files follow an older convention of the code base, but we settled on the explicit style)
52+
* Always use statement blocks for control statements, e.g., in a for-loop, if-condition, ...
53+
* You may use a simple (throw) statement in case of enforcing contracts on argument
54+
* Be explicit about modifiers (some files follow an older convention of the code base, but we settled on the explicit style)
5255

5356
There are a couple of rules, which are definitely not standard, but highly recommended for consistency and readability:
5457

55-
- AngleSharp uses the RHS convention, where types are always put on the right hand side if possible, i.e., preferring `var` under all circumstances
56-
- A single empty line between two non-simple statements (e.g., for-loop and if-condition) should be inserted
57-
- Types are preferred to keywords (`String` instead of `string` or `Int32` instead of `int`)
58-
- `using` statements must be inside the namespace declaration
58+
* AngleSharp uses the RHS convention, where types are always put on the right hand side if possible, i.e., preferring `var` under all circumstances
59+
* A single empty line between two non-simple statements (e.g., for-loop and if-condition) should be inserted
60+
* Types are preferred to keywords (`String` instead of `string` or `Int32` instead of `int`)
61+
* `using` statements must be inside the namespace declaration
5962

6063
### Development Workflow
6164

6265
1. If no issue already exists for the work you'll be doing, create one to document the problem(s) being solved and self-assign.
6366
2. Otherwise please let us know that you are working on the problem. Regular status updates (e.g. "still in progress", "no time anymore", "practically done", "pull request issued") are highly welcome.
64-
2. Create a new branch—please don't work in the `master` branch directly. It is reserved for releases. We recommend naming the branch to match the issue being addressed (`feature/#777` or `issue-777`).
65-
3. Add failing tests for the change you want to make. Tests are crucial and should be taken from W3C (or other specification).
66-
4. Fix stuff. Always go from edge case to edge case.
67-
5. All tests should pass now. Also your new implementation should not break existing tests.
68-
6. Update the documentation to reflect any changes. (or document such changes in the original issue)
69-
7. Push to your fork or push your issue-specific branch to the main repository, then submit a pull request against `devel`.
67+
3. Create a new branch—please don't work in the `master` branch directly. It is reserved for releases. We recommend naming the branch to match the issue being addressed (`feature/#777` or `issue-777`).
68+
4. Add failing tests for the change you want to make. Tests are crucial and should be taken from W3C (or other specification).
69+
5. Fix stuff. Always go from edge case to edge case.
70+
6. All tests should pass now. Also your new implementation should not break existing tests.
71+
7. Update the documentation to reflect any changes. (or document such changes in the original issue)
72+
8. Push to your fork or push your issue-specific branch to the main repository, then submit a pull request against `devel`.
7073

7174
Just to illustrate the git workflow for AngleSharp a little bit more we've added the following graphs.
7275

@@ -76,19 +79,19 @@ Here we now created a new branch called `devel`. This is the development branch.
7679

7780
Now active work is supposed to be done. Therefore a new branch should be created. Let's create one:
7881

79-
```
82+
```sh
8083
git checkout -b feature/#777
8184
```
8285

8386
There may be many of these feature branches. Most of them are also pushed to the server for discussion or synchronization.
8487

85-
```
88+
```sh
8689
git push -u origin feature/#777
8790
```
8891

8992
Now feature branches may be closed when they are done. Here we simply merge with the feature branch(es). For instance the following command takes the `feature/#777` branch from the server and merges it with the `devel` branch.
9093

91-
```
94+
```sh
9295
git checkout devel
9396
git pull
9497
git pull origin feature/#777
@@ -97,7 +100,7 @@ git push
97100

98101
Finally, we may have all the features that are needed to release a new version of AngleSharp. Here we tag the release. For instance for the 1.0 release we use `v1.0`.
99102

100-
```
103+
```sh
101104
git checkout master
102105
git merge devel
103106
git tag v1.0
@@ -109,12 +112,11 @@ git tag v1.0
109112

110113
The following files should not be edited directly in the current repository, but rather in the `AngleSharp.GitBase` repository. They are then synced via `git pull` from a different remote.
111114

112-
```
115+
```plaintext
113116
.editorconfig
114117
.gitignore
115118
.gitattributes
116119
.github/*
117-
appveyor.yml
118120
build.ps1
119121
build.sh
120122
tools/anglesharp.cake
@@ -124,7 +126,7 @@ LICENSE
124126

125127
To sync manually:
126128

127-
```
129+
```sh
128130
git remote add gitbase git@github.com:AngleSharp/AngleSharp.GitBase.git
129131
git pull gitbase master
130132
```

‎.github/FUNDING.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# These are supported funding model platforms
2+
3+
github: FlorianRappl
4+
custom: https://salt.bountysource.com/teams/anglesharp

‎.github/workflows/ci.yml

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: CI
2+
3+
on: [push, pull_request]
4+
5+
env:
6+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
8+
DOCS_PATH: ${{ secrets.DOCS_PATH }}
9+
DOCS_BRANCH: ${{ secrets.DOCS_BRANCH }}
10+
11+
jobs:
12+
can_document:
13+
runs-on: ubuntu-latest
14+
outputs:
15+
value: ${{ steps.check_job.outputs.value }}
16+
steps:
17+
- name: Checks whether documentation can be built
18+
id: check_job
19+
run: |
20+
echo "value: ${{ env.DOCS_PATH != null && github.ref == env.DOCS_BRANCH }}"
21+
echo "::set-output name=value::${{ env.DOCS_PATH != null && github.ref == env.DOCS_BRANCH }}"
22+
23+
documentation:
24+
needs: [can_document]
25+
runs-on: ubuntu-latest
26+
if: needs.can_document.outputs.value == 'true'
27+
28+
steps:
29+
- uses: actions/checkout@v2
30+
31+
- name: Use Node.js
32+
uses: actions/setup-node@v1
33+
with:
34+
node-version: "14.x"
35+
registry-url: 'https://registry.npmjs.org'
36+
37+
- name: Install Dependencies
38+
run: |
39+
cd $DOCS_PATH
40+
npm install
41+
42+
- name: Deploy Doclet
43+
run: |
44+
cd $DOCS_PATH
45+
npx pilet publish --fresh --url https://feed.piral.cloud/api/v1/pilet/anglesharp --api-key ${{ secrets.PIRAL_FEED_KEY }}
46+
47+
linux:
48+
runs-on: ubuntu-latest
49+
50+
steps:
51+
- uses: actions/checkout@v2
52+
53+
- name: Build
54+
run: ./build.sh
55+
56+
windows:
57+
runs-on: windows-latest
58+
59+
steps:
60+
- uses: actions/checkout@v2
61+
62+
- name: Build
63+
run: |
64+
if ($env:GITHUB_REF -eq "refs/heads/main") {
65+
.\build.ps1 -Target Publish
66+
} elseif ($env:GITHUB_REF -eq "refs/heads/devel") {
67+
.\build.ps1 -Target PrePublish
68+
} else {
69+
.\build.ps1
70+
}

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ artifacts/
7575
[Tt]ools/
7676
![Tt]ools/packages.config
7777
TestResults/
78+
node_modules
79+
package-lock.json
7880
*.nuget.targets
7981
*.nuget.props
8082
*.nupkg

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 0.15.0
2+
3+
Released on Sunday, June 12 2021.
4+
5+
- Updated to use AngleSharp 0.15
6+
17
# 0.14.0
28

39
Released on Tuesday, March 31 2020.

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013 - 2020 AngleSharp
3+
Copyright (c) 2013 - 2021 AngleSharp
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎appveyor.yml

-20
This file was deleted.

‎build.cake

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ var frameworks = new Dictionary<String, String>
66
{ "net46", "net46" },
77
{ "net461", "net461" },
88
{ "net472", "net472" },
9-
{ "netstandard1.3", "netstandard1.3" },
109
{ "netstandard2.0", "netstandard2.0" },
1110
};
1211

‎build.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ $NUGET_OLD_URL = "https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe"
2626
# Should we use experimental build of Roslyn?
2727
$UseExperimental = "";
2828
if ($Experimental.IsPresent) {
29-
$UseExperimental = "-experimental"
29+
$UseExperimental = "--experimental"
3030
}
3131

3232
# Is this a dry run?
3333
if ($WhatIf.IsPresent) {
34-
$UseDryRun = "-dryrun"
34+
$UseDryRun = "--dryrun"
3535
}
3636

3737
# Should we use mono?
3838
if ($Mono.IsPresent) {
39-
$UseMono = "-mono"
39+
$UseMono = "--mono"
4040
}
4141

4242
# Try download NuGet.exe if do not exist.
@@ -77,5 +77,5 @@ if (!(Test-Path $CAKE_EXE)) {
7777
}
7878

7979
# Start Cake
80-
Invoke-Expression "$CAKE_EXE `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
80+
Invoke-Expression "$CAKE_EXE `"$Script`" --target=`"$Target`" --configuration=`"$Configuration`" --verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
8181
exit $LASTEXITCODE

‎build.sh

100644100755
+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ for i in "$@"; do
2727
-t|--target) TARGET="$2"; shift ;;
2828
-c|--configuration) CONFIGURATION="$2"; shift ;;
2929
-v|--verbosity) VERBOSITY="$2"; shift ;;
30-
-d|--dryrun) DRYRUN="-dryrun" ;;
30+
-d|--dryrun) DRYRUN="--dryrun" ;;
3131
--version) SHOW_VERSION=true ;;
3232
--) shift; SCRIPT_ARGUMENTS+=("$@"); break ;;
3333
*) SCRIPT_ARGUMENTS+=("$1") ;;
@@ -87,7 +87,7 @@ fi
8787

8888
# Start Cake
8989
if $SHOW_VERSION; then
90-
exec mono $CAKE_EXE -version
90+
exec mono $CAKE_EXE --version
9191
else
92-
exec mono $CAKE_EXE $SCRIPT -verbosity=$VERBOSITY -configuration=$CONFIGURATION -target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}"
92+
exec mono $CAKE_EXE $SCRIPT --verbosity=$VERBOSITY --configuration=$CONFIGURATION --target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}"
9393
fi

‎docs/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# AngleSharp.Js Documentation
2+
3+
We have more detailed information regarding the following subjects:
4+
5+
- [API Documentation](tutorials/01-API.md)

‎docs/general/01-Basics.md

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
title: "Getting Started"
3+
section: "AngleSharp.Js"
4+
---
5+
# Getting Started
6+
7+
## Requirements
8+
9+
AngleSharp.Js comes currently in two flavors: on Windows for .NET 4.6 and in general targetting .NET Standard 2.0 platforms.
10+
11+
Most of the features of the library do not require .NET 4.6, which means you could create your own fork and modify it to work with previous versions of the .NET-Framework.
12+
13+
You need to have AngleSharp installed already. This could be done via NuGet:
14+
15+
```ps1
16+
Install-Package AngleSharp
17+
```
18+
19+
## Getting AngleSharp.Js over NuGet
20+
21+
The simplest way of integrating AngleSharp.Js to your project is by using NuGet. You can install AngleSharp.Js by opening the package manager console (PM) and typing in the following statement:
22+
23+
```ps1
24+
Install-Package AngleSharp.Js
25+
```
26+
27+
You can also use the graphical library package manager ("Manage NuGet Packages for Solution"). Searching for "AngleSharp.Js" in the official NuGet online feed will find this library.
28+
29+
## Setting up AngleSharp.Js
30+
31+
To use AngleSharp.Js you need to add it to your `Configuration` coming from AngleSharp itself.
32+
33+
If you just want a configuration *that works* you should use the following code:
34+
35+
```cs
36+
var config = Configuration.Default
37+
.WithJs(); // from AngleSharp.Js
38+
```
39+
40+
This will register a scripting engine for JS files. The JS parsing options and more could be set with parameters of the `WithJs` method.
41+
42+
You can also use this part with a console for logging. The call for this is `WithConsoleLogger`, e.g.,
43+
44+
```cs
45+
var config = Configuration.Default
46+
.WithJs()
47+
.WithConsoleLogger(ctx => new MyConsoleLogger(ctx));
48+
```
49+
50+
in the previous example `MyConsoleLogger` refers to a class implementing the `IConsoleLogger` interface. Examples of classes implementing this interface are available in our [samples repository](https://github.com/AngleSharp/AngleSharp.Samples).

‎docs/tutorials/01-API.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
title: "API Documentation"
3+
section: "AngleSharp.Js"
4+
---
5+
# API Documentation
6+
7+
(tbd)

‎docs/tutorials/02-Examples.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
title: "Examples"
3+
section: "AngleSharp.Js"
4+
---
5+
# Example Code
6+
7+
This is a (growing) list of examples for every-day usage of AngleSharp.Wasm.
8+
9+
## Some Example
10+
11+
(tbd)

‎docs/tutorials/03-Questions.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
title: "Questions"
3+
section: "AngleSharp.Js"
4+
---
5+
# Frequently Asked Questions
6+
7+
## What to ask?
8+
9+
(tbd)

0 commit comments

Comments
 (0)
Please sign in to comment.