Skip to content

Commit c84a082

Browse files
dsymedsyme
authored
Merge branch 'main' into repo-assist/fix-issue-1310-xsd-embedded-resource-466ae4f06439984d
2 parents 644162c + a662d72 commit c84a082

14 files changed

Lines changed: 235 additions & 170 deletions

File tree

‎paket.dependencies‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ group Fake
4040
nuget Fake.DotNet.MsBuild 6.1.3
4141
nuget Fake.Tools.Git 6.1.3
4242
nuget Fake.DotNet.Paket 6.1.3
43-
nuget Microsoft.Build 17.11.4
44-
nuget Microsoft.Build.Framework 17.11.4
45-
nuget Microsoft.Build.Tasks.Core 17.11.4
46-
nuget Microsoft.Build.Utilities.Core 17.11.4
43+
nuget Microsoft.Build 17.14.28
44+
nuget Microsoft.Build.Framework 17.14.28
45+
nuget Microsoft.Build.Tasks.Core 17.14.28
46+
nuget Microsoft.Build.Utilities.Core 17.14.28
4747

4848
group Test
4949
frameworks: net8.0

‎paket.lock‎

Lines changed: 186 additions & 147 deletions
Large diffs are not rendered by default.

‎src/FSharp.Data.Csv.Core/FSharp.Data.Csv.Core.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
<ItemGroup>
2424
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
2525
</ItemGroup>
26-
<Import Project="../../.paket/Paket.Restore.targets" />
27-
</Project>
26+
<Import Project="..\..\.paket\Paket.Restore.targets" />
27+
</Project>

‎src/FSharp.Data.DesignTime/FSharp.Data.DesignTime.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@
4444
<ProjectReference Include="../FSharp.Data.WorldBank.Core/FSharp.Data.WorldBank.Core.fsproj" />
4545
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
4646
</ItemGroup>
47-
<Import Project="../../.paket/Paket.Restore.targets" />
48-
</Project>
47+
<Import Project="..\..\.paket\Paket.Restore.targets" />
48+
</Project>

‎src/FSharp.Data.Html.Core/FSharp.Data.Html.Core.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
<ProjectReference Include="../FSharp.Data.Csv.Core/FSharp.Data.Csv.Core.fsproj" />
3131
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
3232
</ItemGroup>
33-
<Import Project="../../.paket/Paket.Restore.targets" />
34-
</Project>
33+
<Import Project="..\..\.paket\Paket.Restore.targets" />
34+
</Project>

‎src/FSharp.Data.Html.Core/HtmlCssSelectors.fs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,16 @@ module internal HtmlCssSelectors =
178178
| StartsWith ":enabled" t -> tokenize' (Enabled(getOffset t + 1) :: acc) t
179179
| StartsWith ":file" t -> tokenize' (File(getOffset t + 1) :: acc) t
180180
| StartsWith ":submit" t -> tokenize' (Submit(getOffset t + 1) :: acc) t
181+
| ':' :: t ->
182+
let s, _ = readString "" t
183+
184+
raise (
185+
NotSupportedException(
186+
sprintf
187+
"CSS pseudo-class or pseudo-element ':%s' is not supported. See https://fsprojects.github.io/FSharp.Data/library/HtmlCssSelectors.html for the list of supported selectors."
188+
s
189+
)
190+
)
181191

182192
| '>' :: t ->
183193
let seqtoken = acc |> List.toSeq |> Seq.skip (1) |> Seq.toList

‎src/FSharp.Data.Http/FSharp.Data.Http.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
<None Include="../../docs/img/logo.png" Pack="true" PackagePath="" />
1818
<None Include="paket.references" />
1919
</ItemGroup>
20-
<Import Project="../../.paket/Paket.Restore.targets" />
21-
</Project>
20+
<Import Project="..\..\.paket\Paket.Restore.targets" />
21+
</Project>

‎src/FSharp.Data.Json.Core/FSharp.Data.Json.Core.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
<ProjectReference Include="../FSharp.Data.Http/FSharp.Data.Http.fsproj" />
2828
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
2929
</ItemGroup>
30-
<Import Project="../../.paket/Paket.Restore.targets" />
31-
</Project>
30+
<Import Project="..\..\.paket\Paket.Restore.targets" />
31+
</Project>

‎src/FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
<ItemGroup>
2929
<ProjectReference Include="../FSharp.Data.Http/FSharp.Data.Http.fsproj" />
3030
</ItemGroup>
31-
<Import Project="../../.paket/Paket.Restore.targets" />
32-
</Project>
31+
<Import Project="..\..\.paket\Paket.Restore.targets" />
32+
</Project>

‎src/FSharp.Data.Runtime.Utilities/TextRuntime.fs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,16 @@ type TextRuntime =
7171
|> Option.bind (TextConversions.AsDateTime(TextRuntime.GetCulture cultureStr))
7272

7373
static member ConvertDateTimeOffset(cultureStr, text) =
74+
let culture = TextRuntime.GetCulture cultureStr
75+
7476
text
75-
|> Option.bind (TextConversions.AsDateTimeOffset(TextRuntime.GetCulture cultureStr))
77+
|> Option.bind (fun s ->
78+
match TextConversions.AsDateTimeOffset culture s with
79+
| Some dto -> Some dto
80+
| None ->
81+
// Fall back for xs:dateTime values without timezone (DateTimeKind.Unspecified).
82+
// AsDateTime converts Unspecified to Local, so DateTimeOffset(dt) uses the local offset.
83+
TextConversions.AsDateTime culture s |> Option.map DateTimeOffset)
7684

7785
static member ConvertTimeSpan(cultureStr, text) =
7886
text

0 commit comments

Comments
 (0)