Skip to content

Commit 258acac

Browse files
authored
Merge pull request #88 from fsprojects/prepare-version-2-0-0-rc3
Bump version to 2.0.0-rc3
2 parents ee1b423 + 7ddfcd8 commit 258acac

File tree

5 files changed

+28
-25
lines changed

5 files changed

+28
-25
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
]
1010
},
1111
"paket": {
12-
"version": "6.0.3",
12+
"version": "6.0.13",
1313
"commands": [
1414
"paket"
1515
]
1616
},
1717
"fsharp.formatting.commandtool": {
18-
"version": "11.4.2",
18+
"version": "11.4.3",
1919
"commands": [
2020
"fsdocs"
2121
]

.paket/Paket.Restore.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@
365365
PackageLicenseFile="$(PackageLicenseFile)"
366366
PackageLicenseExpression="$(PackageLicenseExpression)"
367367
PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
368-
PackageReadmeFile="$(PackageReadmeFile)"
369-
NoDefaultExcludes="$(NoDefaultExcludes) "/>
368+
Readme="$(PackageReadmeFile)"
369+
NoDefaultExcludes="$(NoDefaultExcludes)"/>
370370

371371
<PackTask Condition="$(UseMSBuild16_0_Pack)"
372372
PackItem="$(PackProjectInputFile)"

RELEASE_NOTES.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#### 2.0.0-rc3
2+
3+
* Add ability to read from stream instead of file
4+
15
#### 2.0.0-rc2
26

37
* Add improved error messages when an invalid cast is attempted
@@ -13,7 +17,7 @@
1317

1418
Still to be done in modernising the build infrastructure:
1519
* Update the documentation generation and publishing.
16-
* Update the publishing of nuget package to Nuget.
20+
* Update the publishing of nuget package to Nuget.
1721
* Update the generation of releases on GitHub.
1822

1923
#### 1.0.1
@@ -72,4 +76,4 @@ Still to be done in modernising the build infrastructure:
7276
* Using a Row type, with a ToString() method
7377

7478
#### 0.0.1-alpha - 21.02.2014
75-
* Initial release of ExcelProvider
79+
* Initial release of ExcelProvider

nuget/paket.template

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
type file
22
id ExcelProvider
33
version
4-
2.0.0-rc2
4+
2.0.0-rc3
55
authors
66
Steffen Forkmann, Gustavo Guerra, JohnDoeKyrgyz, Don Syme, Quintus Marais
77
owners
@@ -23,8 +23,7 @@ description
2323
tags
2424
F# fsharp typeproviders Excel
2525
releaseNotes
26-
Only built for NetStandard 2.0.
27-
Fix issue when file locked by another process.
26+
Add ability to read from stream not only from file
2827

2928
files
3029
../bin/ExcelProvider.Runtime/netstandard2.0/ExcelProvider.Runtime.* ==> lib/netstandard2.0
@@ -36,4 +35,4 @@ dependencies
3635
FSharp.Core >= LOCKEDVERSION
3736
ExcelDataReader >= LOCKEDVERSION
3837
ExcelDataReader.DataSet >= LOCKEDVERSION
39-
System.Text.Encoding.CodePages >= LOCKEDVERSION
38+
System.Text.Encoding.CodePages >= LOCKEDVERSION

paket.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ NUGET
188188
FSharp.Core (5.0.1)
189189
MAB.DotIgnore (3.0.2)
190190
NETStandard.Library (>= 1.6.1)
191-
Microsoft.Build (16.10)
192-
Microsoft.Build.Framework (>= 16.10) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
191+
Microsoft.Build (16.11)
192+
Microsoft.Build.Framework (>= 16.11) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
193193
Microsoft.NET.StringTools (>= 1.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
194194
Microsoft.Win32.Registry (>= 4.3) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
195195
System.Collections.Immutable (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
@@ -199,11 +199,11 @@ NUGET
199199
System.Text.Encoding.CodePages (>= 4.0.1) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
200200
System.Text.Json (>= 4.7) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
201201
System.Threading.Tasks.Dataflow (>= 4.9) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
202-
Microsoft.Build.Framework (16.10)
202+
Microsoft.Build.Framework (16.11)
203203
System.Security.Permissions (>= 4.7)
204-
Microsoft.Build.Tasks.Core (16.10)
205-
Microsoft.Build.Framework (>= 16.10)
206-
Microsoft.Build.Utilities.Core (>= 16.10)
204+
Microsoft.Build.Tasks.Core (16.11)
205+
Microsoft.Build.Framework (>= 16.11)
206+
Microsoft.Build.Utilities.Core (>= 16.11)
207207
Microsoft.NET.StringTools (>= 1.0)
208208
Microsoft.Win32.Registry (>= 4.3)
209209
System.CodeDom (>= 4.4)
@@ -214,8 +214,8 @@ NUGET
214214
System.Security.Cryptography.Xml (>= 4.7)
215215
System.Security.Permissions (>= 4.7)
216216
System.Threading.Tasks.Dataflow (>= 4.9)
217-
Microsoft.Build.Utilities.Core (16.10)
218-
Microsoft.Build.Framework (>= 16.10)
217+
Microsoft.Build.Utilities.Core (16.11)
218+
Microsoft.Build.Framework (>= 16.11)
219219
Microsoft.NET.StringTools (>= 1.0)
220220
Microsoft.Win32.Registry (>= 4.3)
221221
System.Collections.Immutable (>= 5.0)
@@ -239,11 +239,11 @@ NUGET
239239
Microsoft.Win32.SystemEvents (5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
240240
Microsoft.NETCore.Platforms (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp2.0))
241241
Mono.Posix.NETStandard (1.0)
242-
MSBuild.StructuredLogger (2.1.507)
243-
Microsoft.Build (>= 16.4)
244-
Microsoft.Build.Framework (>= 16.4)
245-
Microsoft.Build.Tasks.Core (>= 16.4)
246-
Microsoft.Build.Utilities.Core (>= 16.4)
242+
MSBuild.StructuredLogger (2.1.545)
243+
Microsoft.Build (>= 16.10)
244+
Microsoft.Build.Framework (>= 16.10)
245+
Microsoft.Build.Tasks.Core (>= 16.10)
246+
Microsoft.Build.Utilities.Core (>= 16.10)
247247
NETStandard.Library (2.0.3)
248248
Microsoft.NETCore.Platforms (>= 1.1)
249249
Newtonsoft.Json (13.0.1)
@@ -748,7 +748,7 @@ RESTRICTION: == net5.0
748748
NUGET
749749
remote: https://api.nuget.org/v3/index.json
750750
FSharp.Core (5.0.2)
751-
FsUnit (4.0.5)
751+
FsUnit (4.0.6)
752752
FSharp.Core (>= 4.7.2)
753753
NETStandard.Library (>= 2.0.3)
754754
NUnit (>= 3.13.2 < 3.14)
@@ -765,7 +765,7 @@ NUGET
765765
NUnit.Extension.TeamCityEventListener (>= 1.0.7)
766766
NUnit.Extension.VSProjectLoader (>= 3.8)
767767
NUnit.ConsoleRunner (3.12)
768-
NUnit.Extension.NUnitProjectLoader (3.6)
768+
NUnit.Extension.NUnitProjectLoader (3.7)
769769
NUnit.Extension.NUnitV2Driver (3.8)
770770
NUnit.Extension.NUnitV2ResultWriter (3.6)
771771
NUnit.Extension.TeamCityEventListener (1.0.7)

0 commit comments

Comments
 (0)