Merge pull request #31 from AngleSharp/devel

Release 0.12.1
AngleSharp · May 14, 2019 · d10525f · d10525f
2 parents e59a6e7 + 7041c44
commit d10525f
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 0.12.1
+
+Released on Wednesday, May 15 2019.
+
+- Binary version fix
+- Fixed indexers are missing a `DomAccessorAttribute` (#30)
+- Added `cssRules` alias: `rules` (#29)
+
 # 0.12.0
 
 Released on Sunday, May 12 2019.

diff --git a/build.cake b/build.cake
@@ -50,17 +50,20 @@ Task("Restore-Packages")
     .IsDependentOn("Clean")
     .Does(() =>
     {
-        NuGetRestore("./src/AngleSharp.Css.sln", new NuGetRestoreSettings {
-            ToolPath = "tools/nuget.exe"
+        NuGetRestore("./src/AngleSharp.Css.sln", new NuGetRestoreSettings
+        {
+            ToolPath = "tools/nuget.exe",
         });
     });
 
 Task("Build")
     .IsDependentOn("Restore-Packages")
     .Does(() =>
     {
-        DotNetCoreBuild("./src/AngleSharp.Css.sln", new DotNetCoreBuildSettings() {
-           Configuration = configuration
+        ReplaceRegexInFiles("./src/Directory.Build.props", "(?<=<Version>)(.+?)(?=</Version>)", version);
+        DotNetCoreBuild("./src/AngleSharp.Css.sln", new DotNetCoreBuildSettings
+        {
+           Configuration = configuration,
         });
     });
 
@@ -70,7 +73,7 @@ Task("Run-Unit-Tests")
     {
         var settings = new DotNetCoreTestSettings
         {
-            Configuration = configuration
+            Configuration = configuration,
         };
 
         if (isRunningOnAppVeyor)
@@ -92,7 +95,7 @@ Task("Copy-Files")
         var mapping = new Dictionary<String, String>
         {
             { "net46", "net46" },
-            { "netstandard2.0", "netstandard2.0" }
+            { "netstandard2.0", "netstandard2.0" },
         };
 
         if (!isRunningOnWindows)
@@ -107,7 +110,7 @@ Task("Copy-Files")
             CopyFiles(new FilePath[]
             {
                 buildDir + Directory(item.Value) + File("AngleSharp.Css.dll"),
-                buildDir + Directory(item.Value) + File("AngleSharp.Css.xml")
+                buildDir + Directory(item.Value) + File("AngleSharp.Css.xml"),
             }, targetDir);
         }
 
@@ -119,12 +122,8 @@ Task("Create-Package")
     .Does(() =>
     {
         var nugetExe = GetFiles("./tools/**/nuget.exe").FirstOrDefault()
-            ?? (isRunningOnAppVeyor ? GetFiles("C:\\Tools\\NuGet3\\nuget.exe").FirstOrDefault() : null);
-
-        if (nugetExe == null)
-        {
-            throw new InvalidOperationException("Could not find nuget.exe.");
-        }
+            ?? (isRunningOnAppVeyor ? GetFiles("C:\\Tools\\NuGet3\\nuget.exe").FirstOrDefault() : null)
+            ?? throw new InvalidOperationException("Could not find nuget.exe.");
 
         var nuspec = nugetRoot + File("AngleSharp.Css.nuspec");
 
@@ -133,7 +132,10 @@ Task("Create-Package")
             Version = version,
             OutputDirectory = nugetRoot,
             Symbols = false,
-            Properties = new Dictionary<String, String> { { "Configuration", configuration } }
+            Properties = new Dictionary<String, String>
+            {
+                { "Configuration", configuration },
+            },
         });
     });
 
@@ -154,7 +156,7 @@ Task("Publish-Package")
             NuGetPush(nupkg, new NuGetPushSettings
             {
                 Source = "https://nuget.org/api/v2/package",
-                ApiKey = apiKey
+                ApiKey = apiKey,
             });
         }
     });
@@ -173,7 +175,7 @@ Task("Publish-Release")
 
         var github = new GitHubClient(new ProductHeaderValue("AngleSharpCakeBuild"))
         {
-            Credentials = new Credentials(githubToken)
+            Credentials = new Credentials(githubToken),
         };
 
         var newRelease = github.Repository.Release;

diff --git a/src/AngleSharp.Css.Tests/AngleSharp.Css.Tests.csproj b/src/AngleSharp.Css.Tests/AngleSharp.Css.Tests.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp.Xml" Version="0.12.0" />
+    <PackageReference Include="AngleSharp.Xml" Version="0.12.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />

diff --git a/src/AngleSharp.Css.nuspec b/src/AngleSharp.Css.nuspec
@@ -14,7 +14,7 @@
     <copyright>Copyright 2016-2019, AngleSharp</copyright>
     <tags>html html5 css css3 dom styling library anglesharp angle</tags>
     <dependencies>
-      <dependency id="AngleSharp" version="0.12.0" />
+      <dependency id="AngleSharp" version="0.12.1" />
     </dependencies>
   </metadata>
 </package>
diff --git a/src/AngleSharp.Css/AngleSharp.Css.csproj b/src/AngleSharp.Css/AngleSharp.Css.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.12.0" />
+    <PackageReference Include="AngleSharp" Version="0.12.1" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">

diff --git a/src/AngleSharp.Css/Dom/ICssGroupingRule.cs b/src/AngleSharp.Css/Dom/ICssGroupingRule.cs
@@ -14,6 +14,7 @@ public interface ICssGroupingRule : ICssRule
         /// Gets a list of all CSS rules contained within the grouping block.
         /// </summary>
         [DomName("cssRules")]
+        [DomName("rules")]
         ICssRuleList Rules { get; }
 
         /// <summary>

diff --git a/src/AngleSharp.Css/Dom/ICssKeyframesRule.cs b/src/AngleSharp.Css/Dom/ICssKeyframesRule.cs
@@ -19,6 +19,7 @@ public interface ICssKeyframesRule : ICssRule
         /// Gets a CSSRuleList of the CSS rules in the media rule.
         /// </summary>
         [DomName("cssRules")]
+        [DomName("rules")]
         ICssRuleList Rules { get; }
 
         /// <summary>
@@ -32,7 +33,7 @@ public interface ICssKeyframesRule : ICssRule
         void Add(String rule);
 
         /// <summary>
-        /// Deletes a keyframe rule from the current CSSKeyframesRule. 
+        /// Deletes a keyframe rule from the current CSSKeyframesRule.
         /// </summary>
         /// <param name="key">
         /// The index of the keyframe to be deleted, expressed as a string
@@ -45,7 +46,7 @@ public interface ICssKeyframesRule : ICssRule
         /// Returns a keyframe rule corresponding to the given key.
         /// </summary>
         /// <param name="key">
-        /// A string containing an index of the keyframe to be returned, 
+        /// A string containing an index of the keyframe to be returned,
         /// resolving to a number between 0 and 1.
         /// </param>
         /// <returns>The keyframe or null.</returns>

diff --git a/src/AngleSharp.Css/Dom/ICssPseudoElementList.cs b/src/AngleSharp.Css/Dom/ICssPseudoElementList.cs
@@ -21,6 +21,7 @@ public interface ICssPseudoElementList
         /// <param name="index">The 0-based index.</param>
         /// <returns>The pseudo element, if any.</returns>
         [DomName("item")]
+        [DomAccessor(Accessors.Getter)]
         ICssPseudoElement this[Int32 index] { get; }
 
         /// <summary>

diff --git a/src/AngleSharp.Css/Dom/ICssRuleList.cs b/src/AngleSharp.Css/Dom/ICssRuleList.cs
@@ -1,4 +1,4 @@
-namespace AngleSharp.Css.Dom
+namespace AngleSharp.Css.Dom
 {
     using AngleSharp.Attributes;
     using System;
@@ -16,6 +16,7 @@ public interface ICssRuleList : IEnumerable<ICssRule>
         /// <param name="index">The 0-based index of the rule.</param>
         /// <returns>The CSS rule at the given index, if any.</returns>
         [DomName("item")]
+        [DomAccessor(Accessors.Getter)]
         ICssRule this[Int32 index] { get; }
 
         /// <summary>

diff --git a/src/AngleSharp.Css/Dom/ICssStyleSheet.cs b/src/AngleSharp.Css/Dom/ICssStyleSheet.cs
@@ -21,6 +21,7 @@ public interface ICssStyleSheet : IStyleSheet
         /// Gets a CSSRuleList of the CSS rules in the style sheet.
         /// </summary>
         [DomName("cssRules")]
+        [DomName("rules")]
         ICssRuleList Rules { get; }
 
         /// <summary>

diff --git a/src/AngleSharp.Performance.Css/AngleSharp.Performance.Css.csproj b/src/AngleSharp.Performance.Css/AngleSharp.Performance.Css.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Alba.CsCss" version="1.0.1.0" />
-    <PackageReference Include="AngleSharp" Version="0.12.0" />
+    <PackageReference Include="AngleSharp" Version="0.12.1" />
     <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.10.1</Version>
+    <Version>0.12.1</Version>
   </PropertyGroup>
 </Project>