diff --git a/CHANGELOG.md b/CHANGELOG.md index bf045463..f0447ab7 100644 --- 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 index aa45e263..024bfc65 100644 --- a/src/AngleSharp.Css.Tests/AngleSharp.Css.Tests.csproj +++ b/src/AngleSharp.Css.Tests/AngleSharp.Css.Tests.csproj @@ -1,10 +1,10 @@ - + netcoreapp2.1 true Key.snk false - 7.1 + 9.0 AngleSharp.Css.Tests true @@ -16,7 +16,7 @@ - + diff --git a/src/AngleSharp.Css.Tests/Functions/CssDocumentFunction.cs b/src/AngleSharp.Css.Tests/Functions/CssDocumentFunction.cs index a2ab3fd6..49b95970 100644 --- 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 index 29bc34c2..a62c3174 100644 --- 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 index 0f93ab26..72d5978e 100644 --- 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 index 5133dc54..d8471f18 100644 --- 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 index 41f1cf9b..2a329c39 100644 --- 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 index 8e33fe5f..f401d037 100644 --- a/src/AngleSharp.Css.nuspec +++ b/src/AngleSharp.Css.nuspec @@ -14,7 +14,7 @@ Copyright 2016-2021, AngleSharp html html5 css css3 dom styling library anglesharp angle - + diff --git a/src/AngleSharp.Css/AngleSharp.Css.csproj b/src/AngleSharp.Css/AngleSharp.Css.csproj index 5b59d267..d2665667 100644 --- a/src/AngleSharp.Css/AngleSharp.Css.csproj +++ b/src/AngleSharp.Css/AngleSharp.Css.csproj @@ -7,7 +7,7 @@ true Key.snk true - 7.1 + 9.0 https://github.com/AngleSharp/AngleSharp.Css git true @@ -21,7 +21,7 @@ - + diff --git a/src/AngleSharp.Css/Dom/CssHelpers.cs b/src/AngleSharp.Css/Dom/CssHelpers.cs index f10c12db..228412b6 100644 --- 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 index ac9510fc..f771fd8d 100644 --- 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; /// diff --git a/src/AngleSharp.Css/Dom/Internal/DocumentFunction.cs b/src/AngleSharp.Css/Dom/Internal/DocumentFunction.cs index 40d19114..d6db9281 100644 --- 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 index 5fbe382e..922d93ec 100644 --- 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 index 0f3d2c38..f3e51c2b 100644 --- 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 index 15f2851b..369b3589 100644 --- 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; /// diff --git a/src/AngleSharp.Css/Dom/Internal/DocumentFunctions/UrlPrefixFunction.cs b/src/AngleSharp.Css/Dom/Internal/DocumentFunctions/UrlPrefixFunction.cs index afcaf7f4..d84337b4 100644 --- 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; /// diff --git a/src/AngleSharp.Css/Extensions/ValidationExtensions.cs b/src/AngleSharp.Css/Extensions/ValidationExtensions.cs index 937c4cb5..cd7ff474 100644 --- 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 index 95501300..63ce44e7 100644 --- 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 index e675b2ee..94392381 100644 --- 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 index dc739028..1685a657 100644 --- 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 index 7b707132..cbc35a2b 100644 --- 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 index 3677da94..c6bcfdc0 100644 --- 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 index 07b0f8fa..5ff45cae 100644 --- a/src/AngleSharp.Performance.Css/AngleSharp.Performance.Css.csproj +++ b/src/AngleSharp.Performance.Css/AngleSharp.Performance.Css.csproj @@ -21,7 +21,7 @@ - + \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 7b45d666..9150a5ba 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,6 +2,6 @@ Extends the CSSOM from the core AngleSharp library. AngleSharp.Css - 0.15.1 + 0.16.0 diff --git a/tools/anglesharp.cake b/tools/anglesharp.cake index 09988d9b..bfcc3bdc 100644 --- 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(); });