Merge branch 'StefH:master' into alternate-namespace-for-function

StefH · Jul 4, 2021 · 6de400e · 6de400e
2 parents acbb364 + e3a5f31
commit 6de400e
Show file tree

Hide file tree

Showing 19 changed files with 352 additions and 89,991 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: https://www.paypal.me/stefheyenrath
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <!--<PropertyGroup>
-    <VersionPrefix>1.0.11.0</VersionPrefix>
+    <VersionPrefix>1.1.1</VersionPrefix>
   </PropertyGroup>-->
 
   <Choose>

diff --git a/GitHubReleaseNotes.txt b/GitHubReleaseNotes.txt
@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes
 
-GitHubReleaseNotes.exe --output ReleaseNotes.md --skip-empty-releases  --exclude-labels question invalid doc --version 1.1.0.0
+GitHubReleaseNotes --output ReleaseNotes.md --skip-empty-releases  --exclude-labels question invalid doc wontfix --version 1.1.2
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Project is forked from https://xpath2.codeplex.com/
 
 ## Info
 
-It conforms for 12953 from 15133 (85.59%) regarding the test-set `XQTSCatalog.xml` (XQTS 1.0.2 Nov. 20, 2006) at https://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/
+It conforms for 12954 from 15133 (85.60%) regarding the test-set `XQTSCatalog.xml` (XQTS 1.0.2 Nov. 20, 2006) at https://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/
 
 API used is an anology to the standard one built into the platform: you utilize XPath2Expression instead of the common XPathExpression and a set of extension functions for XNode, XPathNavigator and XmlNode classes.
 

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,48 +1,57 @@
-# 1.1.0.0 (08 September 2020)
-- [#36](https://github.com/StefH/XPath2.Net/pull/36) - Rewrite yyerror method to fix SonarQube issue [enhancement] contributed by [StefH](https://github.com/StefH)
-- [#37](https://github.com/StefH/XPath2.Net/pull/37) - Make ast public [enhancement] contributed by [binarycow](https://github.com/binarycow)
-- [#35](https://github.com/StefH/XPath2.Net/issues/35) - Expose the AST? [enhancement]
-
-# 1.0.12.0 (04 August 2020)
-- [#34](https://github.com/StefH/XPath2.Net/pull/34) - Fixed 'XPath2Expression.Compile throws exception in Mono' [bug] contributed by [StefH](https://github.com/StefH)
-- [#33](https://github.com/StefH/XPath2.Net/issues/33) - XPath2Expression.Compile throws exception in Mono [bug]
-
-# 1.0.11.0 (08 May 2020)
-- [#30](https://github.com/StefH/XPath2.Net/pull/30) - Fix NuGet for net40 and add source-link [bug] contributed by [StefH](https://github.com/StefH)
-- [#29](https://github.com/StefH/XPath2.Net/issues/29) - Wrong version of XPath.dll is packaged in the 1.0.10 nupkg for net40 [bug]
-
-# 1.0.10.0 (11 September 2019)
-- [#28](https://github.com/StefH/XPath2.Net/pull/28) - Fix &quot;MoveToNext&quot; (throws Null Exception on .NET Standard / Core) [bug] contributed by [StefH](https://github.com/StefH)
-- [#27](https://github.com/StefH/XPath2.Net/issues/27) - Selecting multiple results throws null exception on .NET Core [bug]
-
-# 1.0.9.0 (18 June 2019)
-- [#26](https://github.com/StefH/XPath2.Net/pull/26) - Fix Round() [bug] contributed by [StefH](https://github.com/StefH)
-- [#25](https://github.com/StefH/XPath2.Net/issues/25) - round(2.5) evaluates to 2 [bug]
-
-# 1.0.8.0 (28 May 2019)
-- [#24](https://github.com/StefH/XPath2.Net/pull/24) - Add function &quot;string()&quot; [bug] contributed by [StefH](https://github.com/StefH)
-- [#23](https://github.com/StefH/XPath2.Net/issues/23) - Calling string() in step fails with Wmhelp.XPath2.XPath2Exception: The function 'string'/0 was not found [bug]
-
-# 1.0.7.0 (23 May 2019)
-- [#22](https://github.com/StefH/XPath2.Net/pull/22) - Using a variable in XPath2Select on an XPathNavigator should work [bug] contributed by [StefH](https://github.com/StefH)
-- [#20](https://github.com/StefH/XPath2.Net/issues/20) - Should using  a variable in XPath2Select on an XPathNavigator work?
-
-# 1.0.6.1 (29 October 2018)
-- [#16](https://github.com/StefH/XPath2.Net/pull/16) - ns:number function does not operate on a node #15 contributed by [wjgerritsen-0001](https://github.com/wjgerritsen-0001)
-- [#18](https://github.com/StefH/XPath2.Net/pull/18) - Set up CI with Azure Pipelines contributed by [azure-pipelines[bot]](https://github.com/apps/azure-pipelines)
-- [#15](https://github.com/StefH/XPath2.Net/issues/15) - ns:number function does not operate on a node
-- [#17](https://github.com/StefH/XPath2.Net/issues/17) - Implement Azure Pipelines for CI (remove app-veyor) [enhancement]
-
-# 1.0.6.0 (29 October 2018)
-- [#19](https://github.com/StefH/XPath2.Net/pull/19) - sign + fix appveyor contributed by [StefH](https://github.com/StefH)
-- [#10](https://github.com/StefH/XPath2.Net/issues/10) - Bug in netstandard 2.0 : XPath2Exception in simple Compile [bug]
-
-# 1.0.5.1 (15 August 2017)
-- [#8](https://github.com/StefH/XPath2.Net/pull/8) - Added netstandard2.0 target framework [enhancement] contributed by [kashifsoofi](https://github.com/kashifsoofi)
-- [#11](https://github.com/StefH/XPath2.Net/pull/11) - Netstandard20 fix contributed by [StefH](https://github.com/StefH)
-- [#1](https://github.com/StefH/XPath2.Net/issues/1) - FunctionTable.Instance.AddAllExtensions throws exception when called multiple times [bug]
-- [#2](https://github.com/StefH/XPath2.Net/issues/2) - Fix version from XPath2 to 1.0.2 [enhancement]
-- [#3](https://github.com/StefH/XPath2.Net/issues/3) - Update project to the NETStandard 1.6
-- [#4](https://github.com/StefH/XPath2.Net/issues/4) - spelling mistake
-- [#5](https://github.com/StefH/XPath2.Net/issues/5) - Add json-to-xml / json-to-xmlstring extensions [enhancement]
-
+# 1.1.2 (23 June 2021)
+- [#45](https://github.com/StefH/XPath2.Net/pull/45) - XPath2Evaluate - ToString [bug] contributed by [StefH](https://github.com/StefH)
+- [#13](https://github.com/StefH/XPath2.Net/issues/13) - Using XPath2Evaluate() without a function in command there's always a comma at the end of the value [bug]
+
+# 1.1.1 (18 June 2021)
+- [#42](https://github.com/StefH/XPath2.Net/pull/42) - Default element namespace fix contributed by [martin-honnen](https://github.com/martin-honnen)
+- [#43](https://github.com/StefH/XPath2.Net/pull/43) - Fix CI build [enhancement] contributed by [StefH](https://github.com/StefH)
+- [#31](https://github.com/StefH/XPath2.Net/issues/31) - Default namespace not handled in XPath query [enhancement]
+
+# 1.1.0.0 (08 September 2020)
+- [#36](https://github.com/StefH/XPath2.Net/pull/36) - Rewrite yyerror method to fix SonarQube issue [enhancement] contributed by [StefH](https://github.com/StefH)
+- [#37](https://github.com/StefH/XPath2.Net/pull/37) - Make ast public [enhancement] contributed by [binarycow](https://github.com/binarycow)
+- [#35](https://github.com/StefH/XPath2.Net/issues/35) - Expose the AST? [enhancement]
+
+# 1.0.12.0 (04 August 2020)
+- [#34](https://github.com/StefH/XPath2.Net/pull/34) - Fixed 'XPath2Expression.Compile throws exception in Mono' [bug] contributed by [StefH](https://github.com/StefH)
+- [#33](https://github.com/StefH/XPath2.Net/issues/33) - XPath2Expression.Compile throws exception in Mono [bug]
+
+# 1.0.11.0 (08 May 2020)
+- [#30](https://github.com/StefH/XPath2.Net/pull/30) - Fix NuGet for net40 and add source-link [bug] contributed by [StefH](https://github.com/StefH)
+- [#29](https://github.com/StefH/XPath2.Net/issues/29) - Wrong version of XPath.dll is packaged in the 1.0.10 nupkg for net40 [bug]
+
+# 1.0.10.0 (11 September 2019)
+- [#28](https://github.com/StefH/XPath2.Net/pull/28) - Fix &quot;MoveToNext&quot; (throws Null Exception on .NET Standard / Core) [bug] contributed by [StefH](https://github.com/StefH)
+- [#27](https://github.com/StefH/XPath2.Net/issues/27) - Selecting multiple results throws null exception on .NET Core [bug]
+
+# 1.0.9.0 (18 June 2019)
+- [#26](https://github.com/StefH/XPath2.Net/pull/26) - Fix Round() [bug] contributed by [StefH](https://github.com/StefH)
+- [#25](https://github.com/StefH/XPath2.Net/issues/25) - round(2.5) evaluates to 2 [bug]
+
+# 1.0.8.0 (28 May 2019)
+- [#24](https://github.com/StefH/XPath2.Net/pull/24) - Add function &quot;string()&quot; [bug] contributed by [StefH](https://github.com/StefH)
+- [#23](https://github.com/StefH/XPath2.Net/issues/23) - Calling string() in step fails with Wmhelp.XPath2.XPath2Exception: The function 'string'/0 was not found [bug]
+
+# 1.0.7.0 (23 May 2019)
+- [#22](https://github.com/StefH/XPath2.Net/pull/22) - Using a variable in XPath2Select on an XPathNavigator should work [bug] contributed by [StefH](https://github.com/StefH)
+- [#20](https://github.com/StefH/XPath2.Net/issues/20) - Should using  a variable in XPath2Select on an XPathNavigator work?
+
+# 1.0.6.1 (29 October 2018)
+- [#16](https://github.com/StefH/XPath2.Net/pull/16) - ns:number function does not operate on a node #15 contributed by [wjgerritsen-0001](https://github.com/wjgerritsen-0001)
+- [#18](https://github.com/StefH/XPath2.Net/pull/18) - Set up CI with Azure Pipelines contributed by [azure-pipelines[bot]](https://github.com/apps/azure-pipelines)
+- [#15](https://github.com/StefH/XPath2.Net/issues/15) - ns:number function does not operate on a node
+- [#17](https://github.com/StefH/XPath2.Net/issues/17) - Implement Azure Pipelines for CI (remove app-veyor) [enhancement]
+
+# 1.0.6.0 (29 October 2018)
+- [#19](https://github.com/StefH/XPath2.Net/pull/19) - sign + fix appveyor contributed by [StefH](https://github.com/StefH)
+- [#10](https://github.com/StefH/XPath2.Net/issues/10) - Bug in netstandard 2.0 : XPath2Exception in simple Compile [bug]
+
+# 1.0.5.1 (15 August 2017)
+- [#8](https://github.com/StefH/XPath2.Net/pull/8) - Added netstandard2.0 target framework [enhancement] contributed by [kashifsoofi](https://github.com/kashifsoofi)
+- [#11](https://github.com/StefH/XPath2.Net/pull/11) - Netstandard20 fix contributed by [StefH](https://github.com/StefH)
+- [#1](https://github.com/StefH/XPath2.Net/issues/1) - FunctionTable.Instance.AddAllExtensions throws exception when called multiple times [bug]
+- [#2](https://github.com/StefH/XPath2.Net/issues/2) - Fix version from XPath2 to 1.0.2 [enhancement]
+- [#3](https://github.com/StefH/XPath2.Net/issues/3) - Update project to the NETStandard 1.6
+- [#4](https://github.com/StefH/XPath2.Net/issues/4) - spelling mistake
+- [#5](https://github.com/StefH/XPath2.Net/issues/5) - Add json-to-xml / json-to-xmlstring extensions [enhancement]
+
diff --git a/XPath2.Net.sln b/XPath2.Net.sln
@@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "jay", "jay", "{8946E3FE-DF8
 		dependencies\jay\jay.exe = dependencies\jay\jay.exe
 		dependencies\jay\run-jay.cmd = dependencies\jay\run-jay.cmd
 		dependencies\jay\skeleton.cs = dependencies\jay\skeleton.cs
+		dependencies\jay\XPath.y = dependencies\jay\XPath.y
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E2D9AE26-4F0F-4D09-BFD2-434DE9BDF433}"

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -13,6 +13,14 @@ steps:
     echo "BuildId = $(buildId)"
   displayName: 'Print buildId'
 
+- task: PowerShell@2
+  displayName: "Use JDK11 by default"
+  inputs:
+    targetType: 'inline'
+    script: |
+      $jdkPath = $env:JAVA_HOME_11_X64
+      Write-Host "##vso[task.setvariable variable=JAVA_HOME]$jdkPath"
+
 # Install SonarScanner
 - script: |
     dotnet tool install --global dotnet-sonarscanner
@@ -29,12 +37,18 @@ steps:
   displayName: Begin SonarScanner
 
 - task: DotNetCoreCLI@2
-  displayName: Build Projects in Debug configuration
+  displayName: Build Debug [net452]
   inputs:
     command: 'build'
-    arguments: /p:Configuration=Debug # https://github.com/MicrosoftDocs/vsts-docs/issues/1976
+    arguments: /p:Configuration=Debug --framework net452
     projects: $(buildProjects)
 
+- task: DotNetCoreCLI@2
+  displayName: Build Debug [netstandard2.0]
+  inputs:
+    command: 'build'
+    arguments: /p:Configuration=Debug --framework netstandard2.0
+    projects: $(buildProjects)
 
 # Build tests and run tests for net452 and netcoreapp2.1 (with coverage)
 - script: |
@@ -57,7 +71,7 @@ steps:
   displayName: Build Projects in Release configuration
   inputs:
     command: 'build'
-    arguments: /p:Configuration=Release # https://github.com/MicrosoftDocs/vsts-docs/issues/1976
+    arguments: /p:Configuration=Release
     projects: $(buildProjects)
 
 - task: DotNetCoreCLI@2
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ Project is forked from https://xpath2.codeplex.com/ @@
     ## Info
-    It conforms for 12953 from 15133 (85.59%) regarding the test-set `XQTSCatalog.xml` (XQTS 1.0.2 Nov. 20, 2006) at https://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/
+    It conforms for 12954 from 15133 (85.60%) regarding the test-set `XQTSCatalog.xml` (XQTS 1.0.2 Nov. 20, 2006) at https://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/
     API used is an anology to the standard one built into the platform: you utilize XPath2Expression instead of the common XPathExpression and a set of extension functions for XNode, XPathNavigator and XmlNode classes.
@@ Expand Down @@