Skip to content

Commit 02f7d33

Browse files
dsymedsyme
authored
Merge branch 'main' into daily-test-improver/csv-extensions-tests
2 parents 7455e96 + 5b011d7 commit 02f7d33

12 files changed

Lines changed: 468 additions & 70 deletions

File tree

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.400",
3+
"version": "8.0.119",
44
"rollForward": "major"
55
}
66
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
<Compile Include="CsvFile.fs" />
1616
<Compile Include="CsvExtensions.fs" />
1717
<Compile Include="CsvInference.fs" />
18-
<Compile Include="..\AssemblyInfo.Csv.Core.fs" />
18+
<Compile Include="../AssemblyInfo.Csv.Core.fs" />
1919
<Compile Include="InternalsVisibleTo.fs" />
20-
<None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
20+
<None Include="../../docs/img/logo.png" Pack="true" PackagePath="" />
2121
<None Include="paket.references" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<ProjectReference Include="..\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj" />
24+
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
2525
</ItemGroup>
26-
<Import Project="..\..\.paket\Paket.Restore.targets" />
26+
<Import Project="../../.paket/Paket.Restore.targets" />
2727
</Project>

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,37 @@
1212
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fsi">
15+
<Compile Include="../../paket-files/fsprojects/FSharp.TypeProviders.SDK/src/ProvidedTypes.fsi">
1616
<Link>ProvidedTypes.fsi</Link>
1717
</Compile>
18-
<Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fs">
18+
<Compile Include="../../paket-files/fsprojects/FSharp.TypeProviders.SDK/src/ProvidedTypes.fs">
1919
<Link>ProvidedTypes.fs</Link>
2020
</Compile>
21-
<Compile Include="CommonProviderImplementation\QuotationBuilder.fs" />
22-
<Compile Include="CommonProviderImplementation\AssemblyResolver.fs" />
23-
<Compile Include="CommonProviderImplementation\Helpers.fs" />
24-
<Compile Include="CommonProviderImplementation\ConversionsGenerator.fs" />
25-
<Compile Include="Json\JsonConversionsGenerator.fs" />
26-
<Compile Include="Json\JsonGenerator.fs" />
27-
<Compile Include="Json\JsonProvider.fs" />
28-
<Compile Include="Xml\XmlGenerator.fs" />
29-
<Compile Include="Xml\XmlProvider.fs" />
30-
<Compile Include="Csv\CsvGenerator.fs" />
31-
<Compile Include="Csv\CsvProvider.fs" />
32-
<Compile Include="WorldBank\WorldBankProvider.fs" />
33-
<Compile Include="Html\HtmlGenerator.fs" />
34-
<Compile Include="Html\HtmlProvider.fs" />
35-
<Compile Include="..\AssemblyInfo.DesignTime.fs" />
36-
<None Include="..\Test.fsx" />
21+
<Compile Include="CommonProviderImplementation/QuotationBuilder.fs" />
22+
<Compile Include="CommonProviderImplementation/AssemblyResolver.fs" />
23+
<Compile Include="CommonProviderImplementation/Helpers.fs" />
24+
<Compile Include="CommonProviderImplementation/ConversionsGenerator.fs" />
25+
<Compile Include="Json/JsonConversionsGenerator.fs" />
26+
<Compile Include="Json/JsonGenerator.fs" />
27+
<Compile Include="Json/JsonProvider.fs" />
28+
<Compile Include="Xml/XmlGenerator.fs" />
29+
<Compile Include="Xml/XmlProvider.fs" />
30+
<Compile Include="Csv/CsvGenerator.fs" />
31+
<Compile Include="Csv/CsvProvider.fs" />
32+
<Compile Include="WorldBank/WorldBankProvider.fs" />
33+
<Compile Include="Html/HtmlGenerator.fs" />
34+
<Compile Include="Html/HtmlProvider.fs" />
35+
<Compile Include="../AssemblyInfo.DesignTime.fs" />
36+
<None Include="../Test.fsx" />
3737
<None Include="paket.references" />
3838
</ItemGroup>
3939
<ItemGroup>
40-
<ProjectReference Include="..\FSharp.Data.Json.Core\FSharp.Data.Json.Core.fsproj" />
41-
<ProjectReference Include="..\FSharp.Data.Xml.Core\FSharp.Data.Xml.Core.fsproj" />
42-
<ProjectReference Include="..\FSharp.Data.Csv.Core\FSharp.Data.Csv.Core.fsproj" />
43-
<ProjectReference Include="..\FSharp.Data.Html.Core\FSharp.Data.Html.Core.fsproj" />
44-
<ProjectReference Include="..\FSharp.Data.WorldBank.Core\FSharp.Data.WorldBank.Core.fsproj" />
45-
<ProjectReference Include="..\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj" />
40+
<ProjectReference Include="../FSharp.Data.Json.Core/FSharp.Data.Json.Core.fsproj" />
41+
<ProjectReference Include="../FSharp.Data.Xml.Core/FSharp.Data.Xml.Core.fsproj" />
42+
<ProjectReference Include="../FSharp.Data.Csv.Core/FSharp.Data.Csv.Core.fsproj" />
43+
<ProjectReference Include="../FSharp.Data.Html.Core/FSharp.Data.Html.Core.fsproj" />
44+
<ProjectReference Include="../FSharp.Data.WorldBank.Core/FSharp.Data.WorldBank.Core.fsproj" />
45+
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
4646
</ItemGroup>
47-
<Import Project="..\..\.paket\Paket.Restore.targets" />
47+
<Import Project="../../.paket/Paket.Restore.targets" />
4848
</Project>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
<Compile Include="HtmlActivePatterns.fs" />
2121
<Compile Include="HtmlInference.fs" />
2222
<Compile Include="HtmlRuntime.fs" />
23-
<Compile Include="..\AssemblyInfo.Html.Core.fs" />
23+
<Compile Include="../AssemblyInfo.Html.Core.fs" />
2424
<Compile Include="InternalsVisibleTo.fs" />
25-
<None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
25+
<None Include="../../docs/img/logo.png" Pack="true" PackagePath="" />
2626
<None Include="paket.references" />
2727
</ItemGroup>
2828
<ItemGroup>
29-
<ProjectReference Include="..\FSharp.Data.Csv.Core\FSharp.Data.Csv.Core.fsproj" />
30-
<ProjectReference Include="..\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj" />
29+
<ProjectReference Include="../FSharp.Data.Csv.Core/FSharp.Data.Csv.Core.fsproj" />
30+
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
3131
</ItemGroup>
32-
<Import Project="..\..\.paket\Paket.Restore.targets" />
32+
<Import Project="../../.paket/Paket.Restore.targets" />
3333
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<Compile Include="Http.fs" />
15-
<Compile Include="..\AssemblyInfo.Http.fs" />
15+
<Compile Include="../AssemblyInfo.Http.fs" />
1616
<Compile Include="InternalsVisibleTo.fs" />
17-
<None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
17+
<None Include="../../docs/img/logo.png" Pack="true" PackagePath="" />
1818
<None Include="paket.references" />
1919
</ItemGroup>
20-
<Import Project="..\..\.paket\Paket.Restore.targets" />
20+
<Import Project="../../.paket/Paket.Restore.targets" />
2121
</Project>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
<Compile Include="JsonRuntime.fs" />
1919
<Compile Include="JsonInference.fs" />
2020
<Compile Include="JsonSchema.fs" />
21-
<Compile Include="..\AssemblyInfo.Json.Core.fs" />
21+
<Compile Include="../AssemblyInfo.Json.Core.fs" />
2222
<Compile Include="InternalsVisibleTo.fs" />
23-
<None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
23+
<None Include="../../docs/img/logo.png" Pack="true" PackagePath="" />
2424
<None Include="paket.references" />
2525
</ItemGroup>
2626
<ItemGroup>
27-
<ProjectReference Include="..\FSharp.Data.Http\FSharp.Data.Http.fsproj" />
28-
<ProjectReference Include="..\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj" />
27+
<ProjectReference Include="../FSharp.Data.Http/FSharp.Data.Http.fsproj" />
28+
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
2929
</ItemGroup>
30-
<Import Project="..\..\.paket\Paket.Restore.targets" />
30+
<Import Project="../../.paket/Paket.Restore.targets" />
3131
</Project>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
<Compile Include="TextRuntime.fs" />
2121
<Compile Include="StructuralTypes.fs" />
2222
<Compile Include="StructuralInference.fs" />
23-
<Compile Include="..\AssemblyInfo.Runtime.Utilities.fs" />
23+
<Compile Include="../AssemblyInfo.Runtime.Utilities.fs" />
2424
<Compile Include="InternalsVisibleTo.fs" />
25-
<None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
25+
<None Include="../../docs/img/logo.png" Pack="true" PackagePath="" />
2626
<None Include="paket.references" />
2727
</ItemGroup>
2828
<ItemGroup>
29-
<ProjectReference Include="..\FSharp.Data.Http\FSharp.Data.Http.fsproj" />
29+
<ProjectReference Include="../FSharp.Data.Http/FSharp.Data.Http.fsproj" />
3030
</ItemGroup>
31-
<Import Project="..\..\.paket\Paket.Restore.targets" />
31+
<Import Project="../../.paket/Paket.Restore.targets" />
3232
</Project>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<Compile Include="WorldBankRuntime.fs" />
15-
<Compile Include="..\AssemblyInfo.WorldBank.Core.fs" />
15+
<Compile Include="../AssemblyInfo.WorldBank.Core.fs" />
1616
<Compile Include="InternalsVisibleTo.fs" />
17-
<None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
17+
<None Include="../../docs/img/logo.png" Pack="true" PackagePath="" />
1818
<None Include="paket.references" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<ProjectReference Include="..\FSharp.Data.Http\FSharp.Data.Http.fsproj" />
22-
<ProjectReference Include="..\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj" />
23-
<ProjectReference Include="..\FSharp.Data.Json.Core\FSharp.Data.Json.Core.fsproj" />
21+
<ProjectReference Include="../FSharp.Data.Http/FSharp.Data.Http.fsproj" />
22+
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
23+
<ProjectReference Include="../FSharp.Data.Json.Core/FSharp.Data.Json.Core.fsproj" />
2424
</ItemGroup>
25-
<Import Project="..\..\.paket\Paket.Restore.targets" />
25+
<Import Project="../../.paket/Paket.Restore.targets" />
2626
</Project>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
<Compile Include="XmlExtensions.fs" />
1616
<Compile Include="XmlInference.fs" />
1717
<Compile Include="XsdInference.fs" />
18-
<Compile Include="..\AssemblyInfo.Xml.Core.fs" />
18+
<Compile Include="../AssemblyInfo.Xml.Core.fs" />
1919
<Compile Include="InternalsVisibleTo.fs" />
20-
<None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
20+
<None Include="../../docs/img/logo.png" Pack="true" PackagePath="" />
2121
<None Include="paket.references" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<ProjectReference Include="..\FSharp.Data.Http\FSharp.Data.Http.fsproj" />
25-
<ProjectReference Include="..\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj" />
26-
<ProjectReference Include="..\FSharp.Data.Json.Core\FSharp.Data.Json.Core.fsproj" />
24+
<ProjectReference Include="../FSharp.Data.Http/FSharp.Data.Http.fsproj" />
25+
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
26+
<ProjectReference Include="../FSharp.Data.Json.Core/FSharp.Data.Json.Core.fsproj" />
2727
</ItemGroup>
28-
<Import Project="..\..\.paket\Paket.Restore.targets" />
28+
<Import Project="../../.paket/Paket.Restore.targets" />
2929
</Project>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@
1414
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<Compile Include="..\AssemblyInfo.fs" />
17+
<Compile Include="../AssemblyInfo.fs" />
1818
<Compile Include="Runtime.fs" />
19-
<None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
19+
<None Include="../../docs/img/logo.png" Pack="true" PackagePath="" />
2020
<None Include="paket.references" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<ProjectReference Include="..\FSharp.Data.DesignTime\FSharp.Data.DesignTime.fsproj">
23+
<ProjectReference Include="../FSharp.Data.DesignTime/FSharp.Data.DesignTime.fsproj">
2424
<IsFSharpDesignTimeProvider>true</IsFSharpDesignTimeProvider>
2525
<PrivateAssets>all</PrivateAssets>
2626
</ProjectReference>
27-
<ProjectReference Include="..\FSharp.Data.Json.Core\FSharp.Data.Json.Core.fsproj" />
28-
<ProjectReference Include="..\FSharp.Data.Xml.Core\FSharp.Data.Xml.Core.fsproj" />
29-
<ProjectReference Include="..\FSharp.Data.Csv.Core\FSharp.Data.Csv.Core.fsproj" />
30-
<ProjectReference Include="..\FSharp.Data.Html.Core\FSharp.Data.Html.Core.fsproj" />
31-
<ProjectReference Include="..\FSharp.Data.WorldBank.Core\FSharp.Data.WorldBank.Core.fsproj" />
32-
<ProjectReference Include="..\FSharp.Data.Http\FSharp.Data.Http.fsproj" />
33-
<ProjectReference Include="..\FSharp.Data.Runtime.Utilities\FSharp.Data.Runtime.Utilities.fsproj" />
27+
<ProjectReference Include="../FSharp.Data.Json.Core/FSharp.Data.Json.Core.fsproj" />
28+
<ProjectReference Include="../FSharp.Data.Xml.Core/FSharp.Data.Xml.Core.fsproj" />
29+
<ProjectReference Include="../FSharp.Data.Csv.Core/FSharp.Data.Csv.Core.fsproj" />
30+
<ProjectReference Include="../FSharp.Data.Html.Core/FSharp.Data.Html.Core.fsproj" />
31+
<ProjectReference Include="../FSharp.Data.WorldBank.Core/FSharp.Data.WorldBank.Core.fsproj" />
32+
<ProjectReference Include="../FSharp.Data.Http/FSharp.Data.Http.fsproj" />
33+
<ProjectReference Include="../FSharp.Data.Runtime.Utilities/FSharp.Data.Runtime.Utilities.fsproj" />
3434
</ItemGroup>
35-
<Import Project="..\..\.paket\Paket.Restore.targets" />
35+
<Import Project="../../.paket/Paket.Restore.targets" />
3636
</Project>

0 commit comments

Comments
 (0)