Skip to content

Commit

Permalink
Merge pull request fsprojects#88 from fsprojects/prepare-version-2-0-…
Browse files Browse the repository at this point in the history
…0-rc3

Bump version to 2.0.0-rc3
  • Loading branch information
quintusm authored Aug 31, 2021
2 parents ee1b423 + 7ddfcd8 commit 258acac
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
]
},
"paket": {
"version": "6.0.3",
"version": "6.0.13",
"commands": [
"paket"
]
},
"fsharp.formatting.commandtool": {
"version": "11.4.2",
"version": "11.4.3",
"commands": [
"fsdocs"
]
Expand Down
4 changes: 2 additions & 2 deletions .paket/Paket.Restore.targets
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,8 @@
PackageLicenseFile="$(PackageLicenseFile)"
PackageLicenseExpression="$(PackageLicenseExpression)"
PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)"
PackageReadmeFile="$(PackageReadmeFile)"
NoDefaultExcludes="$(NoDefaultExcludes) "/>
Readme="$(PackageReadmeFile)"
NoDefaultExcludes="$(NoDefaultExcludes)"/>

<PackTask Condition="$(UseMSBuild16_0_Pack)"
PackItem="$(PackProjectInputFile)"
Expand Down
8 changes: 6 additions & 2 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#### 2.0.0-rc3

* Add ability to read from stream instead of file

#### 2.0.0-rc2

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

Still to be done in modernising the build infrastructure:
* Update the documentation generation and publishing.
* Update the publishing of nuget package to Nuget.
* Update the publishing of nuget package to Nuget.
* Update the generation of releases on GitHub.

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

#### 0.0.1-alpha - 21.02.2014
* Initial release of ExcelProvider
* Initial release of ExcelProvider
7 changes: 3 additions & 4 deletions nuget/paket.template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
type file
id ExcelProvider
version
2.0.0-rc2
2.0.0-rc3
authors
Steffen Forkmann, Gustavo Guerra, JohnDoeKyrgyz, Don Syme, Quintus Marais
owners
Expand All @@ -23,8 +23,7 @@ description
tags
F# fsharp typeproviders Excel
releaseNotes
Only built for NetStandard 2.0.
Fix issue when file locked by another process.
Add ability to read from stream not only from file

files
../bin/ExcelProvider.Runtime/netstandard2.0/ExcelProvider.Runtime.* ==> lib/netstandard2.0
Expand All @@ -36,4 +35,4 @@ dependencies
FSharp.Core >= LOCKEDVERSION
ExcelDataReader >= LOCKEDVERSION
ExcelDataReader.DataSet >= LOCKEDVERSION
System.Text.Encoding.CodePages >= LOCKEDVERSION
System.Text.Encoding.CodePages >= LOCKEDVERSION
30 changes: 15 additions & 15 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ NUGET
FSharp.Core (5.0.1)
MAB.DotIgnore (3.0.2)
NETStandard.Library (>= 1.6.1)
Microsoft.Build (16.10)
Microsoft.Build.Framework (>= 16.10) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
Microsoft.Build (16.11)
Microsoft.Build.Framework (>= 16.11) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
Microsoft.NET.StringTools (>= 1.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
Microsoft.Win32.Registry (>= 4.3) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
System.Collections.Immutable (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
Expand All @@ -199,11 +199,11 @@ NUGET
System.Text.Encoding.CodePages (>= 4.0.1) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
System.Text.Json (>= 4.7) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
System.Threading.Tasks.Dataflow (>= 4.9) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net5.0))
Microsoft.Build.Framework (16.10)
Microsoft.Build.Framework (16.11)
System.Security.Permissions (>= 4.7)
Microsoft.Build.Tasks.Core (16.10)
Microsoft.Build.Framework (>= 16.10)
Microsoft.Build.Utilities.Core (>= 16.10)
Microsoft.Build.Tasks.Core (16.11)
Microsoft.Build.Framework (>= 16.11)
Microsoft.Build.Utilities.Core (>= 16.11)
Microsoft.NET.StringTools (>= 1.0)
Microsoft.Win32.Registry (>= 4.3)
System.CodeDom (>= 4.4)
Expand All @@ -214,8 +214,8 @@ NUGET
System.Security.Cryptography.Xml (>= 4.7)
System.Security.Permissions (>= 4.7)
System.Threading.Tasks.Dataflow (>= 4.9)
Microsoft.Build.Utilities.Core (16.10)
Microsoft.Build.Framework (>= 16.10)
Microsoft.Build.Utilities.Core (16.11)
Microsoft.Build.Framework (>= 16.11)
Microsoft.NET.StringTools (>= 1.0)
Microsoft.Win32.Registry (>= 4.3)
System.Collections.Immutable (>= 5.0)
Expand All @@ -239,11 +239,11 @@ NUGET
Microsoft.Win32.SystemEvents (5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
Microsoft.NETCore.Platforms (>= 5.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp2.0))
Mono.Posix.NETStandard (1.0)
MSBuild.StructuredLogger (2.1.507)
Microsoft.Build (>= 16.4)
Microsoft.Build.Framework (>= 16.4)
Microsoft.Build.Tasks.Core (>= 16.4)
Microsoft.Build.Utilities.Core (>= 16.4)
MSBuild.StructuredLogger (2.1.545)
Microsoft.Build (>= 16.10)
Microsoft.Build.Framework (>= 16.10)
Microsoft.Build.Tasks.Core (>= 16.10)
Microsoft.Build.Utilities.Core (>= 16.10)
NETStandard.Library (2.0.3)
Microsoft.NETCore.Platforms (>= 1.1)
Newtonsoft.Json (13.0.1)
Expand Down Expand Up @@ -748,7 +748,7 @@ RESTRICTION: == net5.0
NUGET
remote: https://api.nuget.org/v3/index.json
FSharp.Core (5.0.2)
FsUnit (4.0.5)
FsUnit (4.0.6)
FSharp.Core (>= 4.7.2)
NETStandard.Library (>= 2.0.3)
NUnit (>= 3.13.2 < 3.14)
Expand All @@ -765,7 +765,7 @@ NUGET
NUnit.Extension.TeamCityEventListener (>= 1.0.7)
NUnit.Extension.VSProjectLoader (>= 3.8)
NUnit.ConsoleRunner (3.12)
NUnit.Extension.NUnitProjectLoader (3.6)
NUnit.Extension.NUnitProjectLoader (3.7)
NUnit.Extension.NUnitV2Driver (3.8)
NUnit.Extension.NUnitV2ResultWriter (3.6)
NUnit.Extension.TeamCityEventListener (1.0.7)
Expand Down

0 comments on commit 258acac

Please sign in to comment.