From 41b945a5f379fe11358e67d21991f6f70b25f7f1 Mon Sep 17 00:00:00 2001 From: Quintus Marais Date: Tue, 31 Aug 2021 12:40:58 +0200 Subject: [PATCH 1/3] Bump version to 2.0.0-rc3 --- RELEASE_NOTES.md | 8 ++++++-- nuget/paket.template | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 647c921..991adc1 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -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 @@ -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 @@ -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 \ No newline at end of file +* Initial release of ExcelProvider diff --git a/nuget/paket.template b/nuget/paket.template index bd6b237..943fa80 100644 --- a/nuget/paket.template +++ b/nuget/paket.template @@ -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 @@ -36,4 +36,4 @@ dependencies FSharp.Core >= LOCKEDVERSION ExcelDataReader >= LOCKEDVERSION ExcelDataReader.DataSet >= LOCKEDVERSION - System.Text.Encoding.CodePages >= LOCKEDVERSION \ No newline at end of file + System.Text.Encoding.CodePages >= LOCKEDVERSION From ad26bb1938790919a1330c5543e6461455978b2b Mon Sep 17 00:00:00 2001 From: Quintus Marais Date: Tue, 31 Aug 2021 12:48:36 +0200 Subject: [PATCH 2/3] Update release notes in paket.template --- nuget/paket.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nuget/paket.template b/nuget/paket.template index 943fa80..e2ed9e7 100644 --- a/nuget/paket.template +++ b/nuget/paket.template @@ -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 From 7ddfcd839ab696ea3337d4610c32edd8f10d1329 Mon Sep 17 00:00:00 2001 From: Quintus Marais Date: Tue, 31 Aug 2021 13:08:58 +0200 Subject: [PATCH 3/3] Update tools and packages to newest workable version --- .config/dotnet-tools.json | 4 ++-- .paket/Paket.Restore.targets | 4 ++-- paket.lock | 30 +++++++++++++++--------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 584334b..114802c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -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" ] diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 27b519b..4deb15b 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -365,8 +365,8 @@ PackageLicenseFile="$(PackageLicenseFile)" PackageLicenseExpression="$(PackageLicenseExpression)" PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)" - PackageReadmeFile="$(PackageReadmeFile)" - NoDefaultExcludes="$(NoDefaultExcludes) "/> + Readme="$(PackageReadmeFile)" + NoDefaultExcludes="$(NoDefaultExcludes)"/> = 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)) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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)