Skip to content

Commit bb1008e

Browse files
quintusmquintusm
authored
Merge pull request #112 from quintusm/prepare-release-3-0
Prepare release 3 0
2 parents 3e19661 + 25a6e5d commit bb1008e

File tree

12 files changed

+95
-79
lines changed

12 files changed

+95
-79
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"fake-cli": {
6-
"version": "6.0.0",
6+
"version": "6.1.1",
77
"commands": [
88
"fake"
99
]
@@ -15,13 +15,13 @@
1515
]
1616
},
1717
"fsdocs-tool": {
18-
"version": "20.0.0",
18+
"version": "20.0.1",
1919
"commands": [
2020
"fsdocs"
2121
]
2222
},
2323
"fantomas": {
24-
"version": "6.3.4",
24+
"version": "6.3.13",
2525
"commands": [
2626
"fantomas"
2727
]

‎Directory.Build.props‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
<Project>
2-
<PropertyGroup>
3-
<RepositoryUrl>https://github.com/fsprojects/ExcelProvider</RepositoryUrl>
4-
<FsDocsLicenseLink>https://github.com/fsprojects/ExcelProvider/blob/master/LICENSE.txt</FsDocsLicenseLink>
5-
<FsDocsReleaseNotesLink>https://github.com/fsprojects/ExcelProvider/blob/master/RELEASE_NOTES.md</FsDocsReleaseNotesLink>
6-
<PackageProjectUrl>https://fsprojects.github.io/ExcelProvider/</PackageProjectUrl>
7-
<FsDocsLogoSource>images/logo.png</FsDocsLogoSource>
8-
</PropertyGroup>
2+
<PropertyGroup>
3+
<RepositoryUrl>https://github.com/fsprojects/ExcelProvider</RepositoryUrl>
4+
<PackageProjectUrl>https://fsprojects.github.io/ExcelProvider/</PackageProjectUrl>
5+
</PropertyGroup>
6+
7+
<PropertyGroup>
8+
<NuGetAudit>true</NuGetAudit>
9+
<NuGetAuditMode>all</NuGetAuditMode>
10+
<NuGetAuditLevel>low</NuGetAuditLevel>
11+
</PropertyGroup>
12+
13+
<PropertyGroup>
14+
<FsDocsLicenseLink>https://github.com/fsprojects/ExcelProvider/blob/master/LICENSE.txt</FsDocsLicenseLink>
15+
<FsDocsReleaseNotesLink>https://github.com/fsprojects/ExcelProvider/blob/master/RELEASE_NOTES.md</FsDocsReleaseNotesLink>
16+
<FsDocsLogoSource>images/logo.png</FsDocsLogoSource>
17+
</PropertyGroup>
918
</Project>

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This library is for the .NET platform implementing a read-only Excel type provid
66

77
## Building
88

9-
* Windows: Run ./build.cmd -t Build (see build.fsx for more options to pass in as arguments after -t)
10-
* Requires dotnet core 6.0.421 or higher 6.0 level sdk to be installed.
9+
* Windows: Run ./build.cmd -t "Build" (see build.fsx for more options to pass in as arguments after -t)
10+
* Requires dotnet core 6.0.425 or higher 6.0 level sdk to be installed.
1111
* See DEVGUIDE.md for more information
1212

1313
## Maintainer(s)

‎RELEASE_NOTES.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### 3.0.0
2+
3+
* Fix issue [#41](https://github.com/fsprojects/ExcelProvider/issues/41). The type provider should no longer return an extra blank row with the data as it did before.
4+
* Fix issue [#14](https://github.com/fsprojects/ExcelProvider/issues/41) and related behaviour. We are now better at handling casting of data to the detected data type if there are rows which have data of different data types.
5+
* Both of the above fixes where contributed by new contributor [Matthew Dupont](https://github.com/mjdupont). His contributions are very much appreciated.
6+
* Both fixes, but especially for #41, can break existing code logic. Please test your code after upgrading to this version.
7+
18
### 2.1.0
29

310
* Fix issue [#77](https://github.com/fsprojects/ExcelProvider/issues/77). The type provider will no longer revert to the first sheet if the sheet name provided does not exist. Instead, the code will not compile.

‎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": "6.0.421",
3+
"version": "6.0.425",
44
"rollForward": "minor"
55
}
66
}

‎nuget/paket.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
type file
22
id ExcelProvider
33
version
4-
2.1.0
4+
3.0.0
55
authors
66
Contributors on Github
77
owners
@@ -23,7 +23,7 @@ description
2323
tags
2424
F# fsharp typeproviders Excel
2525
releaseNotes
26-
Fix issue #77. No longer defaults to first sheet in workbook when the requested sheet name does not exist.
26+
Fix issue #14 and issue #41. These are breaking changes.
2727

2828

2929
files

‎paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ group Build
3636
group Test
3737
source https://api.nuget.org/v3/index.json
3838
frameworks: net6.0
39-
nuget Microsoft.NET.Test.Sdk 17.9.0
39+
nuget Microsoft.NET.Test.Sdk
4040
nuget NUnit
4141
nuget NUnit.Console
4242
nuget NUnit3TestAdapter version_in_path: true

‎paket.lock‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
RESTRICTION: == netstandard2.0
22
NUGET
33
remote: https://api.nuget.org/v3/index.json
4-
ExcelDataReader (3.6)
5-
ExcelDataReader.DataSet (3.6)
6-
ExcelDataReader (>= 3.6)
4+
ExcelDataReader (3.7)
5+
ExcelDataReader.DataSet (3.7)
6+
ExcelDataReader (>= 3.7)
77
FSharp.Core (6.0.7)
8-
Microsoft.NET.Test.Sdk (17.9)
8+
Microsoft.NET.Test.Sdk (17.11.1)
99
Microsoft.NETCore.Platforms (7.0.4)
1010
NETStandard.Library (2.0.3)
1111
Microsoft.NETCore.Platforms (>= 1.1)
@@ -221,7 +221,7 @@ NUGET
221221
System.Configuration.ConfigurationManager (>= 6.0)
222222
System.Security.Permissions (>= 6.0) - restriction: == netstandard2.0
223223
System.Text.Encoding.CodePages (>= 6.0) - restriction: == netstandard2.0
224-
Microsoft.NET.StringTools (17.9.5)
224+
Microsoft.NET.StringTools (17.11.4)
225225
System.Memory (>= 4.5.5)
226226
System.Runtime.CompilerServices.Unsafe (>= 6.0)
227227
Microsoft.NETCore.Platforms (7.0.4)
@@ -240,22 +240,22 @@ NUGET
240240
Microsoft.Build.Framework (>= 16.10)
241241
Microsoft.Build.Utilities.Core (>= 16.10)
242242
Newtonsoft.Json (13.0.3)
243-
NuGet.Common (6.9.1)
244-
NuGet.Frameworks (>= 6.9.1)
245-
NuGet.Configuration (6.9.1)
246-
NuGet.Common (>= 6.9.1)
243+
NuGet.Common (6.11)
244+
NuGet.Frameworks (>= 6.11)
245+
NuGet.Configuration (6.11)
246+
NuGet.Common (>= 6.11)
247247
System.Security.Cryptography.ProtectedData (>= 4.4)
248-
NuGet.Frameworks (6.9.1)
249-
NuGet.Packaging (6.9.1)
248+
NuGet.Frameworks (6.11)
249+
NuGet.Packaging (6.11)
250250
Newtonsoft.Json (>= 13.0.3)
251-
NuGet.Configuration (>= 6.9.1)
252-
NuGet.Versioning (>= 6.9.1)
251+
NuGet.Configuration (>= 6.11)
252+
NuGet.Versioning (>= 6.11)
253253
System.Security.Cryptography.Pkcs (>= 6.0.4)
254-
NuGet.Protocol (6.9.1)
255-
NuGet.Packaging (>= 6.9.1)
254+
NuGet.Protocol (6.11)
255+
NuGet.Packaging (>= 6.11)
256256
System.Text.Json (>= 7.0.3) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< net5.0)) (== netstandard2.0)
257-
NuGet.Versioning (6.9.1)
258-
Octokit (11.0.1)
257+
NuGet.Versioning (6.11)
258+
Octokit (13.0.1)
259259
runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
260260
runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
261261
runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
@@ -363,7 +363,7 @@ NUGET
363363
Microsoft.NETCore.Platforms (>= 1.1)
364364
Microsoft.NETCore.Targets (>= 1.1)
365365
System.Runtime (>= 4.3)
366-
System.Formats.Asn1 (8.0)
366+
System.Formats.Asn1 (8.0.1)
367367
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
368368
System.Memory (>= 4.5.5) - restriction: || (&& (== net6.0) (>= net462)) (== netstandard2.0)
369369
System.Globalization (4.3)
@@ -685,7 +685,7 @@ NUGET
685685
System.Security.Cryptography.Primitives (>= 4.3)
686686
System.Text.Encoding (>= 4.3)
687687
System.Threading (>= 4.3)
688-
System.Security.Cryptography.Xml (8.0)
688+
System.Security.Cryptography.Xml (8.0.1)
689689
System.Memory (>= 4.5.5) - restriction: == netstandard2.0
690690
System.Security.AccessControl (>= 6.0) - restriction: == netstandard2.0
691691
System.Security.Cryptography.Pkcs (>= 8.0)
@@ -708,7 +708,7 @@ NUGET
708708
System.Text.Encoding (>= 4.3)
709709
System.Text.Encodings.Web (8.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0))
710710
System.Runtime.CompilerServices.Unsafe (>= 6.0)
711-
System.Text.Json (8.0.3)
711+
System.Text.Json (8.0.4)
712712
System.Runtime.CompilerServices.Unsafe (>= 6.0)
713713
System.Text.Encodings.Web (>= 8.0)
714714
System.Threading (4.3)
@@ -718,7 +718,7 @@ NUGET
718718
Microsoft.NETCore.Platforms (>= 1.1)
719719
Microsoft.NETCore.Targets (>= 1.1)
720720
System.Runtime (>= 4.3)
721-
System.Threading.Tasks.Dataflow (8.0)
721+
System.Threading.Tasks.Dataflow (8.0.1)
722722
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
723723
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0)
724724
System.Threading.Tasks.Parallel (4.3)
@@ -772,51 +772,51 @@ NUGET
772772
FsUnit (6.0)
773773
FSharp.Core (>= 5.0.2)
774774
NUnit (>= 4.0.1)
775-
Microsoft.Build.Framework (17.9.5)
775+
Microsoft.Build.Framework (17.11.4)
776776
Microsoft.Win32.Registry (>= 5.0)
777777
System.Memory (>= 4.5.5)
778778
System.Runtime.CompilerServices.Unsafe (>= 6.0)
779779
System.Security.Principal.Windows (>= 5.0)
780-
Microsoft.Build.Tasks.Core (17.9.5)
781-
Microsoft.Build.Framework (>= 17.9.5)
782-
Microsoft.Build.Utilities.Core (>= 17.9.5)
783-
Microsoft.NET.StringTools (>= 17.9.5)
780+
Microsoft.Build.Tasks.Core (17.11.4)
781+
Microsoft.Build.Framework (>= 17.11.4)
782+
Microsoft.Build.Utilities.Core (>= 17.11.4)
783+
Microsoft.NET.StringTools (>= 17.11.4)
784784
Microsoft.Win32.Registry (>= 5.0)
785-
System.CodeDom (>= 7.0)
785+
System.CodeDom (>= 8.0)
786786
System.Collections.Immutable (>= 8.0)
787787
System.Configuration.ConfigurationManager (>= 8.0)
788788
System.Memory (>= 4.5.5)
789789
System.Reflection.Metadata (>= 8.0)
790790
System.Resources.Extensions (>= 8.0)
791791
System.Runtime.CompilerServices.Unsafe (>= 6.0)
792-
System.Security.Cryptography.Pkcs (>= 7.0.2)
793-
System.Security.Cryptography.Xml (>= 7.0.1)
792+
System.Security.Cryptography.Pkcs (>= 8.0)
793+
System.Security.Cryptography.Xml (>= 8.0)
794794
System.Security.Principal.Windows (>= 5.0)
795795
System.Text.Encoding.CodePages (>= 7.0)
796796
System.Threading.Tasks.Dataflow (>= 8.0)
797-
Microsoft.Build.Utilities.Core (17.9.5)
798-
Microsoft.Build.Framework (>= 17.9.5)
799-
Microsoft.NET.StringTools (>= 17.9.5)
797+
Microsoft.Build.Utilities.Core (17.11.4)
798+
Microsoft.Build.Framework (>= 17.11.4)
799+
Microsoft.NET.StringTools (>= 17.11.4)
800800
Microsoft.Win32.Registry (>= 5.0)
801801
System.Collections.Immutable (>= 8.0)
802802
System.Configuration.ConfigurationManager (>= 8.0)
803803
System.Memory (>= 4.5.5)
804804
System.Runtime.CompilerServices.Unsafe (>= 6.0)
805805
System.Security.Principal.Windows (>= 5.0)
806806
System.Text.Encoding.CodePages (>= 7.0)
807-
Microsoft.CodeCoverage (17.9)
808-
Microsoft.NET.StringTools (17.9.5)
807+
Microsoft.CodeCoverage (17.11.1)
808+
Microsoft.NET.StringTools (17.11.4)
809809
System.Memory (>= 4.5.5)
810810
System.Runtime.CompilerServices.Unsafe (>= 6.0)
811-
Microsoft.NET.Test.Sdk (17.9)
812-
Microsoft.CodeCoverage (>= 17.9)
813-
Microsoft.TestPlatform.TestHost (>= 17.9)
811+
Microsoft.NET.Test.Sdk (17.11.1)
812+
Microsoft.CodeCoverage (>= 17.11.1)
813+
Microsoft.TestPlatform.TestHost (>= 17.11.1)
814814
Microsoft.NETCore.Platforms (7.0.4)
815815
Microsoft.NETCore.Targets (5.0)
816-
Microsoft.TestPlatform.ObjectModel (17.9)
816+
Microsoft.TestPlatform.ObjectModel (17.11.1)
817817
System.Reflection.Metadata (>= 1.6)
818-
Microsoft.TestPlatform.TestHost (17.9)
819-
Microsoft.TestPlatform.ObjectModel (>= 17.9)
818+
Microsoft.TestPlatform.TestHost (17.11.1)
819+
Microsoft.TestPlatform.ObjectModel (>= 17.11.1)
820820
Newtonsoft.Json (>= 13.0.1)
821821
Microsoft.Win32.Primitives (4.3)
822822
Microsoft.NETCore.Platforms (>= 1.1)
@@ -826,21 +826,21 @@ NUGET
826826
System.Security.AccessControl (>= 5.0)
827827
System.Security.Principal.Windows (>= 5.0)
828828
Newtonsoft.Json (13.0.3)
829-
NUnit (4.1)
830-
NUnit.Console (3.17)
831-
NUnit.ConsoleRunner (>= 3.17)
829+
NUnit (4.2.2)
830+
NUnit.Console (3.18.1)
831+
NUnit.ConsoleRunner (>= 3.18.1)
832832
NUnit.Extension.NUnitProjectLoader (>= 3.6)
833833
NUnit.Extension.NUnitV2Driver (>= 3.8)
834834
NUnit.Extension.NUnitV2ResultWriter (>= 3.6)
835835
NUnit.Extension.TeamCityEventListener (>= 1.0.7)
836836
NUnit.Extension.VSProjectLoader (>= 3.8)
837-
NUnit.ConsoleRunner (3.17)
838-
NUnit.Extension.NUnitProjectLoader (3.7.1)
837+
NUnit.ConsoleRunner (3.18.1)
838+
NUnit.Extension.NUnitProjectLoader (3.8)
839839
NUnit.Extension.NUnitV2Driver (3.9)
840-
NUnit.Extension.NUnitV2ResultWriter (3.7)
840+
NUnit.Extension.NUnitV2ResultWriter (3.8)
841841
NUnit.Extension.TeamCityEventListener (1.0.9)
842842
NUnit.Extension.VSProjectLoader (3.9)
843-
NUnit3TestAdapter (4.5.0) - version_in_path: true
843+
NUnit3TestAdapter (4.6.0) - version_in_path: true
844844
runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
845845
runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
846846
runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
@@ -947,7 +947,7 @@ NUGET
947947
Microsoft.NETCore.Platforms (>= 1.1)
948948
Microsoft.NETCore.Targets (>= 1.1)
949949
System.Runtime (>= 4.3)
950-
System.Formats.Asn1 (8.0)
950+
System.Formats.Asn1 (8.0.1)
951951
System.Globalization (4.3)
952952
Microsoft.NETCore.Platforms (>= 1.1)
953953
Microsoft.NETCore.Targets (>= 1.1)
@@ -1249,7 +1249,7 @@ NUGET
12491249
System.Security.Cryptography.Primitives (>= 4.3)
12501250
System.Text.Encoding (>= 4.3)
12511251
System.Threading (>= 4.3)
1252-
System.Security.Cryptography.Xml (8.0)
1252+
System.Security.Cryptography.Xml (8.0.1)
12531253
System.Security.Cryptography.Pkcs (>= 8.0)
12541254
System.Security.Principal (4.3)
12551255
System.Runtime (>= 4.3)
@@ -1272,7 +1272,7 @@ NUGET
12721272
Microsoft.NETCore.Platforms (>= 1.1)
12731273
Microsoft.NETCore.Targets (>= 1.1)
12741274
System.Runtime (>= 4.3)
1275-
System.Threading.Tasks.Dataflow (8.0)
1275+
System.Threading.Tasks.Dataflow (8.0.1)
12761276
System.Threading.Tasks.Parallel (4.3)
12771277
System.Collections.Concurrent (>= 4.3)
12781278
System.Diagnostics.Debug (>= 4.3)

‎src/ExcelProvider.DesignTime/AssemblyInfo.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ open System.Reflection
66
[<assembly: AssemblyTitleAttribute("ExcelProvider.DesignTime")>]
77
[<assembly: AssemblyProductAttribute("ExcelProvider")>]
88
[<assembly: AssemblyDescriptionAttribute("This library implements a read-only Excel type provider for Net Standard 2.0.")>]
9-
[<assembly: AssemblyVersionAttribute("2.1.0")>]
10-
[<assembly: AssemblyFileVersionAttribute("2.1.0")>]
9+
[<assembly: AssemblyVersionAttribute("3.0.0")>]
10+
[<assembly: AssemblyFileVersionAttribute("3.0.0")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
@@ -22,7 +22,7 @@ module internal AssemblyVersionInformation =
2222
"This library implements a read-only Excel type provider for Net Standard 2.0."
2323

2424
[<Literal>]
25-
let AssemblyVersion = "2.1.0"
25+
let AssemblyVersion = "3.0.0"
2626

2727
[<Literal>]
28-
let AssemblyFileVersion = "2.1.0"
28+
let AssemblyFileVersion = "3.0.0"

‎src/ExcelProvider.Runtime/AssemblyInfo.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ open System.Reflection
66
[<assembly: AssemblyTitleAttribute("ExcelProvider.Runtime")>]
77
[<assembly: AssemblyProductAttribute("ExcelProvider")>]
88
[<assembly: AssemblyDescriptionAttribute("This library implements a read-only Excel type provider for Net Standard 2.0.")>]
9-
[<assembly: AssemblyVersionAttribute("2.1.0")>]
10-
[<assembly: AssemblyFileVersionAttribute("2.1.0")>]
9+
[<assembly: AssemblyVersionAttribute("3.0.0")>]
10+
[<assembly: AssemblyFileVersionAttribute("3.0.0")>]
1111
do ()
1212

1313
module internal AssemblyVersionInformation =
@@ -22,7 +22,7 @@ module internal AssemblyVersionInformation =
2222
"This library implements a read-only Excel type provider for Net Standard 2.0."
2323

2424
[<Literal>]
25-
let AssemblyVersion = "2.1.0"
25+
let AssemblyVersion = "3.0.0"
2626

2727
[<Literal>]
28-
let AssemblyFileVersion = "2.1.0"
28+
let AssemblyFileVersion = "3.0.0"

0 commit comments

Comments
 (0)