fsprojects · cartermp · Mar 5, 2023 · Feb 26, 2023 · Feb 26, 2023 · Mar 5, 2023
diff --git a/.editorconfig b/.editorconfig
@@ -9,6 +9,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[*.fsproj]
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
 

diff --git a/FSharp.Data.sln b/FSharp.Data.sln
@@ -92,6 +92,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tutorials", "tutorials", "{
 		docs\tutorials\JsonToXml.fsx = docs\tutorials\JsonToXml.fsx
 	EndProjectSection
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.Runtime.Utilities", "src\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj", "{D04AFA70-4A59-4E1C-AC41-BA0EA70140FF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -150,6 +152,10 @@ Global
 		{A69D007B-EAF0-4866-A8B4-A2EDF2614E56}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A69D007B-EAF0-4866-A8B4-A2EDF2614E56}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A69D007B-EAF0-4866-A8B4-A2EDF2614E56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D04AFA70-4A59-4E1C-AC41-BA0EA70140FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D04AFA70-4A59-4E1C-AC41-BA0EA70140FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D04AFA70-4A59-4E1C-AC41-BA0EA70140FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D04AFA70-4A59-4E1C-AC41-BA0EA70140FF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,9 @@
 ### 6.0.1-beta002 - Jan 6 2023
 
 * Change the namespace of the `InferenceMode` enum from `FSharp.Data.Runtime.StructuralInference` to `FSharp.Data`.
+* Move common runtime utilities out of `FSharp.Data.Http` and into a new `FSharp.Data.Runtime.Utilities` assembly.
+* Add `aria-label` to the list of html attributes used to infer names of types provided by the HtmlProvider.
+* Enable TLS 1.2 when requesting http(s) samples from the type providers.
 
 ### 6.0.1-beta001 - Aug 18 2022
 

diff --git a/build.fsx b/build.fsx
@@ -38,7 +38,7 @@ let description =
     """
   The FSharp.Data packages contain type providers and utilities to access
   common data formats (CSV, HTML, JSON and XML in your F# applications and scripts.
-  
+
   * FSharp.Data -- includes everything
     * FSharp.Data.Http -- http types/helpers
     * FSharp.Data.Csv.Core -- csv types/helpers

diff --git a/docs/library/CsvFile.fsx b/docs/library/CsvFile.fsx
@@ -6,7 +6,7 @@ index: 2
 ---
 *)
 (*** condition: prepare ***)
-#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Csv.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.dll"
 (*** condition: fsx ***)

diff --git a/docs/library/CsvProvider.fsx b/docs/library/CsvProvider.fsx
@@ -6,7 +6,7 @@ index: 1
 ---
 *)
 (*** condition: prepare ***)
-#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Csv.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.dll"
 (*** condition: fsx ***)

diff --git a/docs/library/HtmlCssSelectors.fsx b/docs/library/HtmlCssSelectors.fsx
@@ -6,7 +6,7 @@ index: 4
 ---
 *)
 (*** condition: prepare ***)
-#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Csv.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Html.Core.dll"
 (*** condition: fsx ***)

diff --git a/docs/library/HtmlParser.fsx b/docs/library/HtmlParser.fsx
@@ -6,7 +6,7 @@ index: 3
 ---
 *)
 (*** condition: prepare ***)
-#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Csv.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Html.Core.dll"
 (*** condition: fsx ***)

diff --git a/docs/library/HtmlProvider.fsx b/docs/library/HtmlProvider.fsx
@@ -6,7 +6,7 @@ index: 2
 ---
 *)
 (*** condition: prepare ***)
-#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Csv.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Html.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.dll"
@@ -105,7 +105,7 @@ Note that we're using the live URL as the sample, so we can just use the default
 type NugetStats = HtmlProvider<"https://www.nuget.org/packages/FSharp.Data">
 
 // load the live package stats for FSharp.Data
-let rawStats = NugetStats().Tables.Table4
+let rawStats = NugetStats().Tables.``Version History of FSharp.Data``
 
 // helper function to analyze version numbers from nuget
 let getMinorVersion (v: string) =

diff --git a/docs/library/JsonProvider.fsx b/docs/library/JsonProvider.fsx
@@ -7,6 +7,7 @@ index: 3
 *)
 (*** condition: prepare ***)
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Json.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.dll"
 (*** condition: fsx ***)

diff --git a/docs/library/JsonValue.fsx b/docs/library/JsonValue.fsx
@@ -7,6 +7,7 @@ index: 5
 *)
 (*** condition: prepare ***)
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Json.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.dll"
 (*** condition: fsx ***)

diff --git a/docs/library/WorldBank.fsx b/docs/library/WorldBank.fsx
@@ -6,7 +6,7 @@ index: 5
 ---
 *)
 (*** condition: prepare ***)
-#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.WorldBank.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.dll"
 (*** condition: fsx ***)

diff --git a/docs/library/XmlProvider.fsx b/docs/library/XmlProvider.fsx
@@ -6,7 +6,7 @@ index: 4
 ---
 *)
 (*** condition: prepare ***)
-#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Csv.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Xml.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.dll"
@@ -408,11 +408,11 @@ RSS feed. As discussed earlier, we can use relative paths or web addresses when
 the type provider:
 *)
 
-type Rss = XmlProvider<"http://tomasp.net/rss.xml">
+type Rss = XmlProvider<"https://tomasp.net/rss.xml">
 
 (**
 This code builds a type `Rss` that represents RSS feeds (with the features that are used
-on `http://tomasp.net`). The type `Rss` provides static methods `Parse`, `Load` and `AsyncLoad`
+on `https://tomasp.net`). The type `Rss` provides static methods `Parse`, `Load` and `AsyncLoad`
 to construct it - here, we just want to reuse the same URI of the schema, so we
 use the `GetSample` static method:
 *)

diff --git a/docs/tutorials/JsonAnonymizer.fsx b/docs/tutorials/JsonAnonymizer.fsx
@@ -7,6 +7,7 @@ index: 1
 *)
 (*** condition: prepare ***)
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Json.Core.dll"
 (*** condition: fsx ***)
 #if FSX

diff --git a/docs/tutorials/JsonToXml.fsx b/docs/tutorials/JsonToXml.fsx
@@ -7,6 +7,7 @@ index: 2
 *)
 (*** condition: prepare ***)
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Http.dll"
+#r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Runtime.Utilities.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Csv.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Json.Core.dll"
 #r "../../src/FSharp.Data/bin/Release/netstandard2.0/FSharp.Data.Xml.Core.dll"

diff --git a/src/AssemblyInfo.Runtime.Utilities.fs b/src/AssemblyInfo.Runtime.Utilities.fs
@@ -0,0 +1,17 @@
+// Auto-Generated by FAKE; do not edit
+namespace System
+open System.Reflection
+
+[<assembly: AssemblyTitleAttribute("FSharp.Data.Runtime.Utilities")>]
+[<assembly: AssemblyProductAttribute("FSharp.Data")>]
+[<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
+[<assembly: AssemblyVersionAttribute("6.0.1.0")>]
+[<assembly: AssemblyFileVersionAttribute("6.0.1.0")>]
+do ()
+
+module internal AssemblyVersionInformation =
+    let [<Literal>] AssemblyTitle = "FSharp.Data.Runtime.Utilities"
+    let [<Literal>] AssemblyProduct = "FSharp.Data"
+    let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
+    let [<Literal>] AssemblyVersion = "6.0.1.0"
+    let [<Literal>] AssemblyFileVersion = "6.0.1.0"
diff --git a/src/Csv/CsvExtensions.fs → src/FSharp.Data.Csv.Core/CsvExtensions.fs b/src/Csv/CsvExtensions.fs → src/FSharp.Data.Csv.Core/CsvExtensions.fs
diff --git a/src/Csv/CsvFile.fs → src/FSharp.Data.Csv.Core/CsvFile.fs b/src/Csv/CsvFile.fs → src/FSharp.Data.Csv.Core/CsvFile.fs
diff --git a/src/Csv/CsvInference.fs → src/FSharp.Data.Csv.Core/CsvInference.fs b/src/Csv/CsvInference.fs → src/FSharp.Data.Csv.Core/CsvInference.fs
diff --git a/src/Csv/CsvRuntime.fs → src/FSharp.Data.Csv.Core/CsvRuntime.fs b/src/Csv/CsvRuntime.fs → src/FSharp.Data.Csv.Core/CsvRuntime.fs
diff --git a/src/FSharp.Data.Csv.Core/FSharp.Data.Csv.Core.fsproj b/src/FSharp.Data.Csv.Core/FSharp.Data.Csv.Core.fsproj
@@ -11,17 +11,17 @@
     <Tailcalls>true</Tailcalls>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Csv\CsvRuntime.fs" />
-    <Compile Include="..\Csv\CsvFile.fs" />
-    <Compile Include="..\Csv\CsvExtensions.fs" />
-    <Compile Include="..\Csv\CsvInference.fs" />
+    <Compile Include="CsvRuntime.fs" />
+    <Compile Include="CsvFile.fs" />
+    <Compile Include="CsvExtensions.fs" />
+    <Compile Include="CsvInference.fs" />
     <Compile Include="..\AssemblyInfo.Csv.Core.fs" />
     <Compile Include="InternalsVisibleTo.fs" />
     <None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
     <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\FSharp.Data.Http\FSharp.Data.Http.fsproj" />
+    <ProjectReference Include="..\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/...roviderImplementation/AssemblyResolver.fs → ...roviderImplementation/AssemblyResolver.fs b/...roviderImplementation/AssemblyResolver.fs → ...roviderImplementation/AssemblyResolver.fs
diff --git a/...derImplementation/ConversionsGenerator.fs → ...derImplementation/ConversionsGenerator.fs b/...derImplementation/ConversionsGenerator.fs → ...derImplementation/ConversionsGenerator.fs
diff --git a/src/CommonProviderImplementation/Helpers.fs → ...e/CommonProviderImplementation/Helpers.fs b/src/CommonProviderImplementation/Helpers.fs → ...e/CommonProviderImplementation/Helpers.fs
@@ -266,7 +266,10 @@ module internal ProviderHelpers =
                       IsUri = false
                       IsResource = false }
                 with e ->
-                    failwithf "The provided sample is neither a file, nor a well-formed %s: %s" formatName e.Message
+                    failwithf
+                        "The provided sample is neither a file, nor a well-formed %s: %s"
+                        formatName
+                        (e.ToString())
 
             | Some uri ->
 
@@ -331,9 +334,17 @@ module internal ProviderHelpers =
                               IsResource = false }
                         with _ ->
                             // if not, return the first exception
-                            failwithf "Cannot read sample %s from '%s': %s" formatName valueToBeParsedOrItsUri e.Message
+                            failwithf
+                                "Cannot read sample %s from '%s': %s"
+                                formatName
+                                valueToBeParsedOrItsUri
+                                (e.ToString())
                     else
-                        failwithf "Cannot read sample %s from '%s': %s" formatName valueToBeParsedOrItsUri e.Message
+                        failwithf
+                            "Cannot read sample %s from '%s': %s"
+                            formatName
+                            valueToBeParsedOrItsUri
+                            (e.ToString())
 
     let private providedTypesCache = createInMemoryCache (TimeSpan.FromSeconds 30.0)
     let private activeDisposeActions = HashSet<_>()

diff --git a/...roviderImplementation/QuotationBuilder.fs → ...roviderImplementation/QuotationBuilder.fs b/...roviderImplementation/QuotationBuilder.fs → ...roviderImplementation/QuotationBuilder.fs
diff --git a/src/Csv/CsvGenerator.fs → ...Sharp.Data.DesignTime/Csv/CsvGenerator.fs b/src/Csv/CsvGenerator.fs → ...Sharp.Data.DesignTime/Csv/CsvGenerator.fs
diff --git a/src/Csv/CsvProvider.fs → ...FSharp.Data.DesignTime/Csv/CsvProvider.fs b/src/Csv/CsvProvider.fs → ...FSharp.Data.DesignTime/Csv/CsvProvider.fs
@@ -17,6 +17,7 @@ open FSharp.Data.Runtime.CsvInference
 open ProviderImplementation
 open ProviderImplementation.QuotationBuilder
 open FSharp.Data.Runtime.StructuralInference
+open System.Net
 
 // --------------------------------------------------------------------------------------
 
@@ -38,6 +39,11 @@ type public CsvProvider(cfg: TypeProviderConfig) as this =
 
     let buildTypes (typeName: string) (args: obj[]) =
 
+        // Enable TLS 1.2 for samples requested through https.
+        ServicePointManager.SecurityProtocol <-
+            ServicePointManager.SecurityProtocol
+            ||| SecurityProtocolType.Tls12
+
         let sample = args.[0] :?> string
         let separators = args.[1] :?> string
         let inferRows = args.[2] :?> int

diff --git a/src/FSharp.Data.DesignTime/FSharp.Data.DesignTime.fsproj b/src/FSharp.Data.DesignTime/FSharp.Data.DesignTime.fsproj
@@ -17,20 +17,20 @@
     <Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fs">
       <Link>ProvidedTypes.fs</Link>
     </Compile>
-    <Compile Include="..\CommonProviderImplementation\QuotationBuilder.fs" />
-    <Compile Include="..\CommonProviderImplementation\AssemblyResolver.fs" />
-    <Compile Include="..\CommonProviderImplementation\Helpers.fs" />
-    <Compile Include="..\CommonProviderImplementation\ConversionsGenerator.fs" />
-    <Compile Include="..\Json\JsonConversionsGenerator.fs" />
-    <Compile Include="..\Json\JsonGenerator.fs" />
-    <Compile Include="..\Json\JsonProvider.fs" />
-    <Compile Include="..\Xml\XmlGenerator.fs" />
-    <Compile Include="..\Xml\XmlProvider.fs" />
-    <Compile Include="..\Csv\CsvGenerator.fs" />
-    <Compile Include="..\Csv\CsvProvider.fs" />
-    <Compile Include="..\WorldBank\WorldBankProvider.fs" />
-    <Compile Include="..\Html\HtmlGenerator.fs" />
-    <Compile Include="..\Html\HtmlProvider.fs" />
+    <Compile Include="CommonProviderImplementation\QuotationBuilder.fs" />
+    <Compile Include="CommonProviderImplementation\AssemblyResolver.fs" />
+    <Compile Include="CommonProviderImplementation\Helpers.fs" />
+    <Compile Include="CommonProviderImplementation\ConversionsGenerator.fs" />
+    <Compile Include="Json\JsonConversionsGenerator.fs" />
+    <Compile Include="Json\JsonGenerator.fs" />
+    <Compile Include="Json\JsonProvider.fs" />
+    <Compile Include="Xml\XmlGenerator.fs" />
+    <Compile Include="Xml\XmlProvider.fs" />
+    <Compile Include="Csv\CsvGenerator.fs" />
+    <Compile Include="Csv\CsvProvider.fs" />
+    <Compile Include="WorldBank\WorldBankProvider.fs" />
+    <Compile Include="Html\HtmlGenerator.fs" />
+    <Compile Include="Html\HtmlProvider.fs" />
     <Compile Include="..\AssemblyInfo.DesignTime.fs" />
     <None Include="..\Test.fsx" />
     <None Include="paket.references" />
@@ -41,7 +41,7 @@
     <ProjectReference Include="..\FSharp.Data.Csv.Core\FSharp.Data.Csv.Core.fsproj" />
     <ProjectReference Include="..\FSharp.Data.Html.Core\FSharp.Data.Html.Core.fsproj" />
     <ProjectReference Include="..\FSharp.Data.WorldBank.Core\FSharp.Data.WorldBank.Core.fsproj" />
-    <ProjectReference Include="..\FSharp.Data.Http\FSharp.Data.Http.fsproj" />
+    <ProjectReference Include="..\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/Html/HtmlGenerator.fs → ...arp.Data.DesignTime/Html/HtmlGenerator.fs b/src/Html/HtmlGenerator.fs → ...arp.Data.DesignTime/Html/HtmlGenerator.fs
diff --git a/src/Html/HtmlProvider.fs → ...harp.Data.DesignTime/Html/HtmlProvider.fs b/src/Html/HtmlProvider.fs → ...harp.Data.DesignTime/Html/HtmlProvider.fs
@@ -11,6 +11,7 @@ open FSharp.Data
 open FSharp.Data.Runtime
 open FSharp.Data.Runtime.BaseTypes
 open FSharp.Data.Runtime.StructuralInference
+open System.Net
 
 #nowarn "10001"
 
@@ -32,6 +33,11 @@ type public HtmlProvider(cfg: TypeProviderConfig) as this =
 
     let buildTypes (typeName: string) (args: obj[]) =
 
+        // Enable TLS 1.2 for samples requested through https.
+        ServicePointManager.SecurityProtocol <-
+            ServicePointManager.SecurityProtocol
+            ||| SecurityProtocolType.Tls12
+
         let sample = args.[0] :?> string
         let preferOptionals = args.[1] :?> bool
         let includeLayoutTables = args.[2] :?> bool

diff --git a/src/Json/JsonConversionsGenerator.fs → ...signTime/Json/JsonConversionsGenerator.fs b/src/Json/JsonConversionsGenerator.fs → ...signTime/Json/JsonConversionsGenerator.fs
diff --git a/src/Json/JsonGenerator.fs → ...arp.Data.DesignTime/Json/JsonGenerator.fs b/src/Json/JsonGenerator.fs → ...arp.Data.DesignTime/Json/JsonGenerator.fs
diff --git a/src/Json/JsonProvider.fs → ...harp.Data.DesignTime/Json/JsonProvider.fs b/src/Json/JsonProvider.fs → ...harp.Data.DesignTime/Json/JsonProvider.fs
@@ -11,6 +11,7 @@ open FSharp.Data.Runtime
 open FSharp.Data.Runtime.BaseTypes
 open FSharp.Data.Runtime.StructuralTypes
 open FSharp.Data.Runtime.StructuralInference
+open System.Net
 
 // ----------------------------------------------------------------------------------------------
 
@@ -34,6 +35,11 @@ type public JsonProvider(cfg: TypeProviderConfig) as this =
 
     let buildTypes (typeName: string) (args: obj[]) =
 
+        // Enable TLS 1.2 for samples requested through https.
+        ServicePointManager.SecurityProtocol <-
+            ServicePointManager.SecurityProtocol
+            ||| SecurityProtocolType.Tls12
+
         // Generate the required type
         let tpType =
             ProvidedTypeDefinition(asm, ns, typeName, None, hideObjectMethods = true, nonNullable = true)

diff --git a/src/WorldBank/WorldBankProvider.fs → ...DesignTime/WorldBank/WorldBankProvider.fs b/src/WorldBank/WorldBankProvider.fs → ...DesignTime/WorldBank/WorldBankProvider.fs
diff --git a/src/Xml/XmlGenerator.fs → ...Sharp.Data.DesignTime/Xml/XmlGenerator.fs b/src/Xml/XmlGenerator.fs → ...Sharp.Data.DesignTime/Xml/XmlGenerator.fs
diff --git a/src/Xml/XmlProvider.fs → ...FSharp.Data.DesignTime/Xml/XmlProvider.fs b/src/Xml/XmlProvider.fs → ...FSharp.Data.DesignTime/Xml/XmlProvider.fs
@@ -12,6 +12,7 @@ open FSharp.Data.Runtime
 open FSharp.Data.Runtime.BaseTypes
 open FSharp.Data.Runtime.StructuralTypes
 open FSharp.Data.Runtime.StructuralInference
+open System.Net
 
 // ----------------------------------------------------------------------------------------------
 
@@ -35,6 +36,11 @@ type public XmlProvider(cfg: TypeProviderConfig) as this =
 
     let buildTypes (typeName: string) (args: obj[]) =
 
+        // Enable TLS 1.2 for samples requested through https.
+        ServicePointManager.SecurityProtocol <-
+            ServicePointManager.SecurityProtocol
+            ||| SecurityProtocolType.Tls12
+
         // Generate the required type
         let tpType =
             ProvidedTypeDefinition(asm, ns, typeName, None, hideObjectMethods = true, nonNullable = true)

diff --git a/src/FSharp.Data.Html.Core/FSharp.Data.Html.Core.fsproj b/src/FSharp.Data.Html.Core/FSharp.Data.Html.Core.fsproj
@@ -11,23 +11,23 @@
     <Tailcalls>true</Tailcalls>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Html\HtmlCssSelectors.fs" />
-    <Compile Include="..\Html\HtmlCharRefs.fs" />
-    <Compile Include="..\Html\HtmlNode.fs" />
-    <Compile Include="..\Html\HtmlParser.fs" />
-    <Compile Include="..\Html\HtmlOperations.fs" />
-    <Compile Include="..\Html\HtmlCssSelectorExtensions.fs" />
-    <Compile Include="..\Html\HtmlActivePatterns.fs" />
-    <Compile Include="..\Html\HtmlInference.fs" />
-    <Compile Include="..\Html\HtmlRuntime.fs" />
+    <Compile Include="HtmlCssSelectors.fs" />
+    <Compile Include="HtmlCharRefs.fs" />
+    <Compile Include="HtmlNode.fs" />
+    <Compile Include="HtmlParser.fs" />
+    <Compile Include="HtmlOperations.fs" />
+    <Compile Include="HtmlCssSelectorExtensions.fs" />
+    <Compile Include="HtmlActivePatterns.fs" />
+    <Compile Include="HtmlInference.fs" />
+    <Compile Include="HtmlRuntime.fs" />
     <Compile Include="..\AssemblyInfo.Html.Core.fs" />
     <Compile Include="InternalsVisibleTo.fs" />
     <None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
     <None Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FSharp.Data.Csv.Core\FSharp.Data.Csv.Core.fsproj" />
-    <ProjectReference Include="..\FSharp.Data.Http\FSharp.Data.Http.fsproj" />
+    <ProjectReference Include="..\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/Html/HtmlActivePatterns.fs → ...harp.Data.Html.Core/HtmlActivePatterns.fs b/src/Html/HtmlActivePatterns.fs → ...harp.Data.Html.Core/HtmlActivePatterns.fs
diff --git a/src/Html/HtmlCharRefs.fs → src/FSharp.Data.Html.Core/HtmlCharRefs.fs b/src/Html/HtmlCharRefs.fs → src/FSharp.Data.Html.Core/HtmlCharRefs.fs
diff --git a/src/Html/HtmlCssSelectorExtensions.fs → ...ta.Html.Core/HtmlCssSelectorExtensions.fs b/src/Html/HtmlCssSelectorExtensions.fs → ...ta.Html.Core/HtmlCssSelectorExtensions.fs
diff --git a/src/Html/HtmlCssSelectors.fs → ...FSharp.Data.Html.Core/HtmlCssSelectors.fs b/src/Html/HtmlCssSelectors.fs → ...FSharp.Data.Html.Core/HtmlCssSelectors.fs
diff --git a/src/Html/HtmlInference.fs → src/FSharp.Data.Html.Core/HtmlInference.fs b/src/Html/HtmlInference.fs → src/FSharp.Data.Html.Core/HtmlInference.fs
diff --git a/src/Html/HtmlNode.fs → src/FSharp.Data.Html.Core/HtmlNode.fs b/src/Html/HtmlNode.fs → src/FSharp.Data.Html.Core/HtmlNode.fs
diff --git a/src/Html/HtmlOperations.fs → src/FSharp.Data.Html.Core/HtmlOperations.fs b/src/Html/HtmlOperations.fs → src/FSharp.Data.Html.Core/HtmlOperations.fs
diff --git a/src/Html/HtmlParser.fs → src/FSharp.Data.Html.Core/HtmlParser.fs b/src/Html/HtmlParser.fs → src/FSharp.Data.Html.Core/HtmlParser.fs