Merge pull request #72 from AngleSharp/devel

FlorianRappl · web-flow · commit 03dbf9b6effb · 2021-06-13T01:31:08.000+02:00
Release 0.16.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.16.0
+
+Released on Sunday, June 13 2021.
+
+- Updated to use AngleSharp 0.16
+
 # 0.15.1
 
 Release on Sunday, June 6 2021.
diff --git a/src/AngleSharp.Css.Tests/AngleSharp.Css.Tests.csproj b/src/AngleSharp.Css.Tests/AngleSharp.Css.Tests.csproj
@@ -1,10 +1,10 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <IsPackable>false</IsPackable>
-    <LangVersion>7.1</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <AssemblyName>AngleSharp.Css.Tests</AssemblyName>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!-- https://github.com/Tyrrrz/GitHubActionsTestLogger/issues/5 -->
   </PropertyGroup>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp.Xml" Version="0.15.0" />
+    <PackageReference Include="AngleSharp.Xml" Version="0.16.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
diff --git a/src/AngleSharp.Css.Tests/Functions/CssDocumentFunction.cs b/src/AngleSharp.Css.Tests/Functions/CssDocumentFunction.cs
@@ -1,6 +1,7 @@
 ﻿namespace AngleSharp.Css.Tests.Functions
 {
     using AngleSharp.Css.Dom;
+    using AngleSharp.Dom;
     using NUnit.Framework;
     using System.Linq;
     using static CssConstructionFunctions;
diff --git a/src/AngleSharp.Css.Tests/Mocks/PageRequester.cs b/src/AngleSharp.Css.Tests/Mocks/PageRequester.cs
@@ -1,5 +1,6 @@
 namespace AngleSharp.Css.Tests.Mocks
 {
+    using AngleSharp.Dom;
     using AngleSharp.Io;
     using AngleSharp.Text;
     using System;
diff --git a/src/AngleSharp.Css.Tests/Mocks/SiteMapping.cs b/src/AngleSharp.Css.Tests/Mocks/SiteMapping.cs
@@ -1,5 +1,6 @@
 namespace AngleSharp.Css.Tests.Mocks
 {
+    using AngleSharp.Dom;
     using AngleSharp.Xml;
     using AngleSharp.Xml.Dom;
     using AngleSharp.Xml.Parser;
diff --git a/src/AngleSharp.Css.Tests/Parsing/CssTokenization.cs b/src/AngleSharp.Css.Tests/Parsing/CssTokenization.cs
@@ -1,6 +1,7 @@
 namespace AngleSharp.Css.Tests.Parsing
 {
     using AngleSharp.Css.Parser;
+    using AngleSharp.Dom;
     using AngleSharp.Text;
     using NUnit.Framework;
 
diff --git a/src/AngleSharp.Css.Tests/Rules/CssImportRule.cs b/src/AngleSharp.Css.Tests/Rules/CssImportRule.cs
@@ -1,5 +1,6 @@
 ﻿namespace AngleSharp.Css.Tests.Rules
 {
+    using AngleSharp.Dom;
     using NUnit.Framework;
     using static CssConstructionFunctions;
 
diff --git a/src/AngleSharp.Css.nuspec b/src/AngleSharp.Css.nuspec
@@ -14,7 +14,7 @@
     <copyright>Copyright 2016-2021, AngleSharp</copyright>
     <tags>html html5 css css3 dom styling library anglesharp angle</tags>
     <dependencies>
-      <dependency id="AngleSharp" version="0.15.0" />
+      <dependency id="AngleSharp" version="0.16.0" />
     </dependencies>
   </metadata>
 </package>
diff --git a/src/AngleSharp.Css/AngleSharp.Css.csproj b/src/AngleSharp.Css/AngleSharp.Css.csproj
@@ -7,7 +7,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>7.1</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <RepositoryUrl>https://github.com/AngleSharp/AngleSharp.Css</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.15.0" />
+    <PackageReference Include="AngleSharp" Version="0.16.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
diff --git a/src/AngleSharp.Css/Dom/CssHelpers.cs b/src/AngleSharp.Css/Dom/CssHelpers.cs
@@ -44,7 +44,7 @@ public static String Escape(String str)
                         continue;
                     }
                     else if (ch < 0x80 && 
-                            !ch.IsOneOf(Symbols.Minus,Symbols.Underscore) && 
+                            !(ch is Symbols.Minus or Symbols.Underscore) && 
                             !ch.IsAlphanumericAscii())
                     {
                         sb.Append(Symbols.ReverseSolidus);
diff --git a/src/AngleSharp.Css/Dom/IDocumentFunction.cs b/src/AngleSharp.Css/Dom/IDocumentFunction.cs
@@ -1,5 +1,6 @@
 ﻿namespace AngleSharp.Css.Dom
 {
+    using AngleSharp.Dom;
     using System;
 
     /// <summary>
diff --git a/src/AngleSharp.Css/Dom/Internal/DocumentFunction.cs b/src/AngleSharp.Css/Dom/Internal/DocumentFunction.cs
@@ -1,5 +1,6 @@
 namespace AngleSharp.Css.Dom
 {
+    using AngleSharp.Dom;
     using AngleSharp.Text;
     using System;
     using System.IO;
diff --git a/src/AngleSharp.Css/Dom/Internal/DocumentFunctions/DomainFunction.cs b/src/AngleSharp.Css/Dom/Internal/DocumentFunctions/DomainFunction.cs
@@ -1,6 +1,7 @@
 ﻿namespace AngleSharp.Css.Dom
 {
     using AngleSharp.Css;
+    using AngleSharp.Dom;
     using AngleSharp.Text;
     using System;
 
diff --git a/src/AngleSharp.Css/Dom/Internal/DocumentFunctions/RegexpFunction.cs b/src/AngleSharp.Css/Dom/Internal/DocumentFunctions/RegexpFunction.cs
@@ -1,6 +1,7 @@
 ﻿namespace AngleSharp.Css.Dom
 {
     using AngleSharp.Css;
+    using AngleSharp.Dom;
     using System;
     using System.Text.RegularExpressions;
 
diff --git a/src/AngleSharp.Css/Dom/Internal/DocumentFunctions/UrlFunction.cs b/src/AngleSharp.Css/Dom/Internal/DocumentFunctions/UrlFunction.cs
@@ -1,6 +1,7 @@
 ﻿namespace AngleSharp.Css.Dom
 {
     using AngleSharp.Css;
+    using AngleSharp.Dom;
     using System;
 
     /// <summary>
diff --git a/src/AngleSharp.Css/Dom/Internal/DocumentFunctions/UrlPrefixFunction.cs b/src/AngleSharp.Css/Dom/Internal/DocumentFunctions/UrlPrefixFunction.cs
@@ -1,6 +1,7 @@
 ﻿namespace AngleSharp.Css.Dom
 {
     using AngleSharp.Css;
+    using AngleSharp.Dom;
     using System;
 
     /// <summary>
diff --git a/src/AngleSharp.Css/Extensions/ValidationExtensions.cs b/src/AngleSharp.Css/Extensions/ValidationExtensions.cs
@@ -1,5 +1,6 @@
 namespace AngleSharp.Css.Dom
 {
+    using AngleSharp.Dom;
     using System;
     using System.Linq;
 
diff --git a/src/AngleSharp.Css/Factories/DefaultDocumentFunctionFactory.cs b/src/AngleSharp.Css/Factories/DefaultDocumentFunctionFactory.cs
@@ -1,6 +1,7 @@
 namespace AngleSharp.Css
 {
     using AngleSharp.Css.Dom;
+    using AngleSharp.Dom;
     using System;
     using System.Collections.Generic;
 
diff --git a/src/AngleSharp.Css/Parser/CssTokenizer.cs b/src/AngleSharp.Css/Parser/CssTokenizer.cs
@@ -1,6 +1,7 @@
 namespace AngleSharp.Css.Parser
 {
     using AngleSharp.Common;
+    using AngleSharp.Dom;
     using AngleSharp.Css.Dom.Events;
     using AngleSharp.Css.Parser.Tokens;
     using AngleSharp.Text;
@@ -65,7 +66,7 @@ public String ContentFrom(Int32 position)
             var current = Current;
             var spaced = 0;
 
-            while (!current.IsOneOf(Symbols.EndOfFile, Symbols.Semicolon, Symbols.CurlyBracketOpen, Symbols.CurlyBracketClose))
+            while (!(current is Symbols.EndOfFile or Symbols.Semicolon or Symbols.CurlyBracketOpen or Symbols.CurlyBracketClose))
             {
                 var token = Data(current);
 
@@ -762,7 +763,7 @@ private CssToken NumberStart(Char current)
         {
             while (true)
             {
-                if (current.IsOneOf(Symbols.Plus, Symbols.Minus))
+                if (current is Symbols.Plus or Symbols.Minus) 
                 {
                     StringBuffer.Append(current);
                     current = GetNext();
@@ -1099,7 +1100,7 @@ private CssToken UrlUQ(Char current)
                 {
                     return NewUrl(FlushBuffer(), bad: true);
                 }
-                else if (current.IsOneOf(Symbols.DoubleQuote, Symbols.SingleQuote, Symbols.RoundBracketOpen) || current.IsNonPrintable())
+                else if (current is Symbols.DoubleQuote or Symbols.SingleQuote or Symbols.RoundBracketOpen || current.IsNonPrintable())
                 {
                     RaiseErrorOccurred(CssParseError.InvalidCharacter);
                     return UrlBad();
diff --git a/src/AngleSharp.Css/Parser/Micro/CssUriParser.cs b/src/AngleSharp.Css/Parser/Micro/CssUriParser.cs
@@ -137,12 +137,12 @@ private static CssUrlValue Unquoted(StringSource source)
                 {
                     return End(source, buffer);
                 }
-                else if (current.IsOneOf(Symbols.RoundBracketClose, Symbols.EndOfFile))
+                else if (current is Symbols.RoundBracketClose or Symbols.EndOfFile) 
                 {
                     source.Next();
                     return new CssUrlValue(buffer.ToPool());
                 }
-                else if (current.IsOneOf(Symbols.DoubleQuote, Symbols.SingleQuote, Symbols.RoundBracketOpen) || current.IsNonPrintable())
+                else if (current is Symbols.DoubleQuote or Symbols.SingleQuote or Symbols.RoundBracketOpen || current.IsNonPrintable())
                 {
                     return Bad(source, buffer);
                 }
diff --git a/src/AngleSharp.Css/Parser/Micro/UnitParser.cs b/src/AngleSharp.Css/Parser/Micro/UnitParser.cs
@@ -289,7 +289,7 @@ private static Unit UnitStart(StringSource source)
         {
             var current = source.Current;
 
-            if (current.IsOneOf(Symbols.Plus, Symbols.Minus))
+            if (current is Symbols.Plus or Symbols.Minus)
             {
                 var next = source.Next();
 
diff --git a/src/AngleSharp.Css/Parser/StringSourceExtensions.cs b/src/AngleSharp.Css/Parser/StringSourceExtensions.cs
@@ -1,4 +1,4 @@
-﻿namespace AngleSharp.Css.Parser
+namespace AngleSharp.Css.Parser
 {
     using AngleSharp.Text;
     using System;
@@ -42,7 +42,7 @@ public static String TakeUntilClosed(this StringSource source)
                     current = source.SkipCssComment();
                     continue;
                 }
-                else if (current.IsOneOf(Symbols.SingleQuote, Symbols.DoubleQuote))
+                else if (current is Symbols.SingleQuote or Symbols.DoubleQuote)
                 {
                     source.ParseString();
                     current = source.Current;
diff --git a/src/AngleSharp.Performance.Css/AngleSharp.Performance.Css.csproj b/src/AngleSharp.Performance.Css/AngleSharp.Performance.Css.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="Alba.CsCss" version="1.0.1.0" />
-    <PackageReference Include="AngleSharp" Version="0.15.0" />
+    <PackageReference Include="AngleSharp" Version="0.16.0" />
     <PackageReference Include="ExCSS" version="2.0.6" />
   </ItemGroup>
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Description>Extends the CSSOM from the core AngleSharp library.</Description>
     <Product>AngleSharp.Css</Product>
-    <Version>0.15.1</Version>
+    <Version>0.16.0</Version>
   </PropertyGroup>
 </Project>
diff --git a/tools/anglesharp.cake b/tools/anglesharp.cake
@@ -178,7 +178,7 @@ Task("Publish-Release")
             Name = version,
             Body = String.Join(Environment.NewLine, releaseNotes.Notes),
             Prerelease = false,
-            TargetCommitish = "master",
+            TargetCommitish = "main",
         }).Wait();
     });
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace AngleSharp.Css.Tests.Functions`
`2`	`2`	`{`
`3`	`3`	`using AngleSharp.Css.Dom;`
	`4`	`+ using AngleSharp.Dom;`
`4`	`5`	`using NUnit.Framework;`
`5`	`6`	`using System.Linq;`
`6`	`7`	`using static CssConstructionFunctions;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`namespace AngleSharp.Css.Tests.Mocks`
`2`	`2`	`{`
	`3`	`+ using AngleSharp.Dom;`
`3`	`4`	`using AngleSharp.Io;`
`4`	`5`	`using AngleSharp.Text;`
`5`	`6`	`using System;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace AngleSharp.Css.Tests.Parsing`
`2`	`2`	`{`
`3`	`3`	`using AngleSharp.Css.Parser;`
	`4`	`+ using AngleSharp.Dom;`
`4`	`5`	`using AngleSharp.Text;`
`5`	`6`	`using NUnit.Framework;`
`6`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`namespace AngleSharp.Css.Tests.Rules`
`2`	`2`	`{`
	`3`	`+ using AngleSharp.Dom;`
`3`	`4`	`using NUnit.Framework;`
`4`	`5`	`using static CssConstructionFunctions;`
`5`	`6`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static String Escape(String str)`
`44`	`44`	`continue;`
`45`	`45`	`}`
`46`	`46`	`else if (ch < 0x80 &&`
`47`		`- !ch.IsOneOf(Symbols.Minus,Symbols.Underscore) &&`
	`47`	`+ !(ch is Symbols.Minus or Symbols.Underscore) &&`
`48`	`48`	`!ch.IsAlphanumericAscii())`
`49`	`49`	`{`
`50`	`50`	`sb.Append(Symbols.ReverseSolidus);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`namespace AngleSharp.Css.Dom`
`2`	`2`	`{`
	`3`	`+ using AngleSharp.Dom;`
`3`	`4`	`using System;`
`4`	`5`
`5`	`6`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace AngleSharp.Css.Dom`
`2`	`2`	`{`
`3`	`3`	`using AngleSharp.Css;`
	`4`	`+ using AngleSharp.Dom;`
`4`	`5`	`using AngleSharp.Text;`
`5`	`6`	`using System;`
`6`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace AngleSharp.Css`
`2`	`2`	`{`
`3`	`3`	`using AngleSharp.Css.Dom;`
	`4`	`+ using AngleSharp.Dom;`
`4`	`5`	`using System;`
`5`	`6`	`using System.Collections.Generic;`
`6`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace AngleSharp.Css.Parser`
`2`	`2`	`{`
`3`	`3`	`using AngleSharp.Common;`
	`4`	`+ using AngleSharp.Dom;`
`4`	`5`	`using AngleSharp.Css.Dom.Events;`
`5`	`6`	`using AngleSharp.Css.Parser.Tokens;`
`6`	`7`	`using AngleSharp.Text;`
`@@ -65,7 +66,7 @@ public String ContentFrom(Int32 position)`
`65`	`66`	`var current = Current;`
`66`	`67`	`var spaced = 0;`
`67`	`68`
`68`		`- while (!current.IsOneOf(Symbols.EndOfFile, Symbols.Semicolon, Symbols.CurlyBracketOpen, Symbols.CurlyBracketClose))`
	`69`	`+ while (!(current is Symbols.EndOfFile or Symbols.Semicolon or Symbols.CurlyBracketOpen or Symbols.CurlyBracketClose))`
`69`	`70`	`{`
`70`	`71`	`var token = Data(current);`
`71`	`72`
`@@ -762,7 +763,7 @@ private CssToken NumberStart(Char current)`
`762`	`763`	`{`
`763`	`764`	`while (true)`
`764`	`765`	`{`
`765`		`- if (current.IsOneOf(Symbols.Plus, Symbols.Minus))`
	`766`	`+ if (current is Symbols.Plus or Symbols.Minus)`
`766`	`767`	`{`
`767`	`768`	`StringBuffer.Append(current);`
`768`	`769`	`current = GetNext();`
`@@ -1099,7 +1100,7 @@ private CssToken UrlUQ(Char current)`
`1099`	`1100`	`{`
`1100`	`1101`	`return NewUrl(FlushBuffer(), bad: true);`
`1101`	`1102`	`}`
`1102`		`- else if (current.IsOneOf(Symbols.DoubleQuote, Symbols.SingleQuote, Symbols.RoundBracketOpen) \|\| current.IsNonPrintable())`
	`1103`	`+ else if (current is Symbols.DoubleQuote or Symbols.SingleQuote or Symbols.RoundBracketOpen \|\| current.IsNonPrintable())`
`1103`	`1104`	`{`
`1104`	`1105`	`RaiseErrorOccurred(CssParseError.InvalidCharacter);`
`1105`	`1106`	`return UrlBad();`
Original file line number	Diff line number	Diff line change
`@@ -137,12 +137,12 @@ private static CssUrlValue Unquoted(StringSource source)`
`137`	`137`	`{`
`138`	`138`	`return End(source, buffer);`
`139`	`139`	`}`
`140`		`- else if (current.IsOneOf(Symbols.RoundBracketClose, Symbols.EndOfFile))`
	`140`	`+ else if (current is Symbols.RoundBracketClose or Symbols.EndOfFile)`
`141`	`141`	`{`
`142`	`142`	`source.Next();`
`143`	`143`	`return new CssUrlValue(buffer.ToPool());`
`144`	`144`	`}`
`145`		`- else if (current.IsOneOf(Symbols.DoubleQuote, Symbols.SingleQuote, Symbols.RoundBracketOpen) \|\| current.IsNonPrintable())`
	`145`	`+ else if (current is Symbols.DoubleQuote or Symbols.SingleQuote or Symbols.RoundBracketOpen \|\| current.IsNonPrintable())`
`146`	`146`	`{`
`147`	`147`	`return Bad(source, buffer);`
`148`	`148`	`}`