From 191abd72be021271dc3f0e554eceaf6361015390 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Tue, 13 May 2025 16:00:45 -0700 Subject: [PATCH 1/3] Bump global.json version --- global.json | 4 ++-- tests/authoring/Framework/HtmlAssertions.fs | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 00b67caef..abf6f352d 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "9.0.100", + "version": "9.0.204", "rollForward": "latestFeature", "allowPrerelease": false } -} \ No newline at end of file +} diff --git a/tests/authoring/Framework/HtmlAssertions.fs b/tests/authoring/Framework/HtmlAssertions.fs index cad73f592..087f6698c 100644 --- a/tests/authoring/Framework/HtmlAssertions.fs +++ b/tests/authoring/Framework/HtmlAssertions.fs @@ -86,11 +86,19 @@ actual: {actual} let private prettyHtml (html:string) (querySelector: string option) = let parser = HtmlParser() let document = parser.ParseDocument(html) + + let elementOpt: IElement option = + match querySelector with + | Some q -> Option.ofObj (document.QuerySelector q) + // IHtmlBodyElement implements IElement. document.Body returns IHtmlBodyElement? + // Option.ofObj will handle if document.Body is null (though unlikely for valid HTML documents) + | None -> Option.ofObj (document.Body :> IElement) + + let element = match querySelector with | Some q -> document.QuerySelector q | None -> document.Body - let links = element.QuerySelectorAll("a") links |> Seq.iter(fun l -> From 34b9a42f5f4d36214e905c4d3683d0627b9af3fe Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Tue, 13 May 2025 16:02:23 -0700 Subject: [PATCH 2/3] test --- .github/actions/bootstrap/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/bootstrap/action.yml b/.github/actions/bootstrap/action.yml index a468540be..41b6dbfa9 100644 --- a/.github/actions/bootstrap/action.yml +++ b/.github/actions/bootstrap/action.yml @@ -20,6 +20,7 @@ runs: git tag --list - uses: actions/setup-dotnet@v4 with: + dotnet-version: 9.0.204 global-json-file: global.json - id: dotnet @@ -37,4 +38,4 @@ runs: cache: npm cache-dependency-path: src/Elastic.Markdown/package-lock.json node-version-file: .nvmrc - \ No newline at end of file + From 07b700d3205297a1d8a1f3ef55df4d9ce5f71191 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Tue, 13 May 2025 16:05:17 -0700 Subject: [PATCH 3/3] test --- .github/actions/bootstrap/action.yml | 3 +-- global.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/bootstrap/action.yml b/.github/actions/bootstrap/action.yml index 41b6dbfa9..5b9171639 100644 --- a/.github/actions/bootstrap/action.yml +++ b/.github/actions/bootstrap/action.yml @@ -20,7 +20,7 @@ runs: git tag --list - uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.204 + dotnet-version: 9.0.100 global-json-file: global.json - id: dotnet @@ -38,4 +38,3 @@ runs: cache: npm cache-dependency-path: src/Elastic.Markdown/package-lock.json node-version-file: .nvmrc - diff --git a/global.json b/global.json index abf6f352d..41c9ad2ed 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.204", + "version": "9.0.100", "rollForward": "latestFeature", "allowPrerelease": false }