Skip to content

Commit 8d12af1

Browse files
FlorianRapplFlorianRappl
authored
Merge pull request #1214 from AngleSharp/devel
Release 1.2.0
2 parents 6aa79f6 + c089bfc commit 8d12af1

34 files changed

+466
-126
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/checkout@v4
5252

5353
- name: Setup dotnet
54-
uses: actions/setup-dotnet@v3
54+
uses: actions/setup-dotnet@v4
5555
with:
5656
dotnet-version: |
5757
6.0.x
@@ -68,7 +68,7 @@ jobs:
6868
- uses: actions/checkout@v4
6969

7070
- name: Setup dotnet
71-
uses: actions/setup-dotnet@v3
71+
uses: actions/setup-dotnet@v4
7272
with:
7373
dotnet-version: |
7474
6.0.x

‎.nuke/build.schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"title": "Build Schema",
43
"$ref": "#/definitions/build",
4+
"title": "Build Schema",
55
"definitions": {
66
"build": {
77
"type": "object",
@@ -131,4 +131,4 @@
131131
}
132132
}
133133
}
134-
}
134+
}

‎CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# 1.2.0
2+
3+
Released on Tuesday, December 31 2024.
4+
5+
- Fixed loading of link element source (#1184) @tomvanenckevort
6+
- Fixed usage of outdated dependency (#1186)
7+
- Fixed cookie `Expires` recognized as local time (#1212) @noobow34
8+
- Fixed validation for problematic decimal step values (#1210) @rhuebner76
9+
- Removed unnecessary references for .NET 6 and higher (#1187) @lahma
10+
- Removed support for .NET 4.6.1 (least version is 4.6.2)
11+
- Updated to NUKE 8 (#1188) @lahma
12+
- Added new `OnToken` event for the tokenizer (#1153) @schaakverslaafd
13+
- Added new setting for disabling `StringBuilder` pooling (#1203) @micahbresette
14+
- Added context to extension methods (#1194) @memiamp
15+
- Added `property` attribute to meta tags (#1195) @hflexgrig
16+
117
# 1.1.2
218

319
Released on Friday, March 8 2024.

‎CONTRIBUTORS.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,14 @@ AngleSharp contains code written by (in order of first pull request / commit):
5353
* [Muhammad Nabilasykar](https://github.com/zukarusan)
5454
* [Dmitry Kushnir](https://github.com/dv00d00)
5555
* [Georg Jung](https://github.com/georg-jung)
56-
* [James Thompson ](https://github.com/thompson-tomo)
56+
* [James Thompson](https://github.com/thompson-tomo)
57+
* [schaakverslaafd](https://github.com/schaakverslaafd)
58+
* [Tom van Enckevort](https://github.com/tomvanenckevort)
59+
* [Micah Bresette](https://github.com/micahbresette)
60+
* [Russ H](https://github.com/rhuebner76)
61+
* [noobow](https://github.com/noobow34)
62+
* [Martin Parkin](https://github.com/memiamp)
63+
* [Hakob Grigoryan](https://github.com/hflexgrig)
5764

5865
Without these awesome people AngleSharp could not exist. Thanks to everyone for your contributions! :beers:
5966

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Every collection in AngleSharp supports LINQ statements. AngleSharp also provide
7070
AngleSharp has been created as a .NET Standard 2.0 compatible library. This includes, but is not limited to:
7171

7272
- .NET Core (2.0 and later)
73-
- .NET Framework (4.6.1 and later)
73+
- .NET Framework (4.6.2 and later)
7474
- Xamarin.Android (7.0 and 8.0)
7575
- Xamarin.iOS (10.0 and 10.14)
7676
- Xamarin.Mac (3.0 and 3.8)

‎build.cmd

100644100755
File mode changed.

‎build.ps1

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ $TempDirectory = "$PSScriptRoot\\.nuke\temp"
1818

1919
$DotNetGlobalFile = "$PSScriptRoot\\global.json"
2020
$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
21-
$DotNetChannel = "Current"
21+
$DotNetChannel = "STS"
2222

23-
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
2423
$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
25-
$env:DOTNET_MULTILEVEL_LOOKUP = 0
24+
$env:DOTNET_NOLOGO = 1
2625

2726
###########################################################################
2827
# EXECUTION
@@ -61,9 +60,15 @@ else {
6160
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
6261
}
6362
$env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
63+
$env:PATH = "$DotNetDirectory;$env:PATH"
6464
}
6565

6666
Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)"
6767

68+
if (Test-Path env:NUKE_ENTERPRISE_TOKEN) {
69+
& $env:DOTNET_EXE nuget remove source "nuke-enterprise" > $null
70+
& $env:DOTNET_EXE nuget add source "https://f.feedz.io/nuke/enterprise/nuget" --name "nuke-enterprise" --username "PAT" --password $env:NUKE_ENTERPRISE_TOKEN > $null
71+
}
72+
6873
ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet }
6974
ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }

‎build.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp"
1414

1515
DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
1616
DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
17-
DOTNET_CHANNEL="Current"
17+
DOTNET_CHANNEL="STS"
1818

1919
export DOTNET_CLI_TELEMETRY_OPTOUT=1
20-
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
21-
export DOTNET_MULTILEVEL_LOOKUP=0
20+
export DOTNET_NOLOGO=1
2221

2322
###########################################################################
2423
# EXECUTION
@@ -54,9 +53,15 @@ else
5453
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
5554
fi
5655
export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
56+
export PATH="$DOTNET_DIRECTORY:$PATH"
5757
fi
5858

5959
echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"
6060

61+
if [[ ! -z ${NUKE_ENTERPRISE_TOKEN+x} && "$NUKE_ENTERPRISE_TOKEN" != "" ]]; then
62+
"$DOTNET_EXE" nuget remove source "nuke-enterprise" &>/dev/null || true
63+
"$DOTNET_EXE" nuget add source "https://f.feedz.io/nuke/enterprise/nuget" --name "nuke-enterprise" --username "PAT" --password "$NUKE_ENTERPRISE_TOKEN" --store-password-in-clear-text &>/dev/null || true
64+
fi
65+
6166
"$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet
6267
"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"

‎docs/general/01-Basics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ section: "AngleSharp.Core"
66

77
## Requirements
88

9-
AngleSharp comes currently in two flavors: on Windows for .NET 4.6.1 or newer and in general targeting .NET Standard 2.0 platforms.
9+
AngleSharp comes currently in two flavors: on Windows for .NET 4.6.2 or newer and in general targeting .NET Standard 2.0 platforms.
1010

11-
Most of the features of the library do not require .NET 4.6.1, which means you could create your own fork and modify it to work with previous versions of the .NET-Framework.
11+
Most of the features of the library do not require .NET 4.6.2, which means you could create your own fork and modify it to work with previous versions of the .NET-Framework.
1212

1313
## Getting AngleSharp over NuGet
1414

‎nuke/Build.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected override void OnBuildInitialized()
100100

101101
Log.Information("Building version: {Version}", Version);
102102

103-
TargetProject = Solution.GetProject(SourceDirectory / TargetProjectName / $"{TargetLibName}.csproj" );
103+
TargetProject = Solution.GetProject(TargetLibName);
104104
TargetProject.NotNull("TargetProject could not be loaded!");
105105

106106
TargetFrameworks = TargetProject.GetTargetFrameworks();
@@ -113,7 +113,7 @@ protected override void OnBuildInitialized()
113113
.Before(Restore)
114114
.Executes(() =>
115115
{
116-
SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
116+
SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(x => x.DeleteDirectory());
117117
});
118118

119119
Target Restore => _ => _
@@ -130,6 +130,7 @@ protected override void OnBuildInitialized()
130130
DotNetBuild(s => s
131131
.SetProjectFile(Solution)
132132
.SetConfiguration(Configuration)
133+
.SetContinuousIntegrationBuild(IsServerBuild)
133134
.EnableNoRestore());
134135
});
135136

@@ -143,6 +144,7 @@ protected override void OnBuildInitialized()
143144
.EnableNoRestore()
144145
.EnableNoBuild()
145146
.SetProcessEnvironmentVariable("prefetched", "false")
147+
.When(GitHubActions.Instance is not null, x => x.SetLoggers("GitHubActions"))
146148
);
147149

148150
DotNetTest(s => s
@@ -151,6 +153,7 @@ protected override void OnBuildInitialized()
151153
.EnableNoRestore()
152154
.EnableNoBuild()
153155
.SetProcessEnvironmentVariable("prefetched", "true")
156+
.When(GitHubActions.Instance is not null, x => x.SetLoggers("GitHubActions"))
154157
);
155158
});
156159

@@ -183,9 +186,9 @@ protected override void OnBuildInitialized()
183186
.SetTargetPath(nuspec)
184187
.SetVersion(Version)
185188
.SetOutputDirectory(NugetDirectory)
186-
.SetSymbols(true)
187-
.SetSymbolPackageFormat("snupkg")
188-
.AddProperty("Configuration", Configuration)
189+
.EnableSymbols()
190+
.SetSymbolPackageFormat(NuGetSymbolPackageFormat.snupkg)
191+
.SetConfiguration(Configuration)
189192
);
190193
});
191194

@@ -202,7 +205,7 @@ protected override void OnBuildInitialized()
202205
throw new BuildAbortedException("Could not resolve the NuGet API key.");
203206
}
204207

205-
foreach (var nupkg in GlobFiles(NugetDirectory, "*.nupkg"))
208+
foreach (var nupkg in NugetDirectory.GlobFiles("*.nupkg"))
206209
{
207210
NuGetPush(s => s
208211
.SetTargetPath(nupkg)

0 commit comments

Comments
 (0)