From b3b0ef099c61d1cd28270a661a2f6ed5d90ada99 Mon Sep 17 00:00:00 2001 From: Isaac Abraham Date: Sun, 2 Feb 2020 19:12:02 +0100 Subject: [PATCH 1/2] Change default TFM on paket init to netcore31 --- src/Paket.Core/PackageAnalysis/Environment.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Paket.Core/PackageAnalysis/Environment.fs b/src/Paket.Core/PackageAnalysis/Environment.fs index 0098fd4d57..d98f3c3c7c 100644 --- a/src/Paket.Core/PackageAnalysis/Environment.fs +++ b/src/Paket.Core/PackageAnalysis/Environment.fs @@ -118,6 +118,6 @@ module PaketEnv = let sources = [PackageSources.DefaultNuGetV3Source] let additionalLines = [ "storage: none" - "framework: netcore3.0, netstandard2.0, netstandard2.1" + "framework: netcore3.1, netstandard2.0, netstandard2.1" ] initWithContent sources additionalLines directory From 268ba876f63b3f7f8a62e7b15cb794094f9e3a29 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Mon, 3 Feb 2020 09:33:51 +0100 Subject: [PATCH 2/2] Bump version to 5.242.0 --- .paket/Paket.Restore.targets | 12 +++++++++--- RELEASE_NOTES.md | 3 +++ src/LockFileComparer/AssemblyInfo.fs | 12 ++++++------ src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 12 ++++++------ src/Paket.Core/AssemblyInfo.fs | 12 ++++++------ src/Paket/AssemblyInfo.fs | 12 ++++++------ 6 files changed, 36 insertions(+), 27 deletions(-) diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index dfc4aaec7a..8d37e28bca 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -27,10 +27,16 @@ $(PaketRootPath)paket.bootstrapper.exe $(PaketToolsPath)paket.bootstrapper.exe $([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\ - + "$(PaketBootStrapperExePath)" $(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)" + + + + true + true + True @@ -130,7 +136,7 @@ - $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``)) $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``)) @@ -163,7 +169,7 @@ - + diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index c59db79ed0..923dc92b15 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.242.0 - 2020-02-03 +* Change default TFM on paket init to netcoreap31 + #### 5.241.6 - 2020-01-04 * REVERT: Do only disable automagic when FSharp.Core is actually used - https://github.com/fsprojects/Paket/issues/3769 diff --git a/src/LockFileComparer/AssemblyInfo.fs b/src/LockFileComparer/AssemblyInfo.fs index ad2cb0d616..f4680a0cf4 100644 --- a/src/LockFileComparer/AssemblyInfo.fs +++ b/src/LockFileComparer/AssemblyInfo.fs @@ -6,9 +6,9 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = @@ -16,6 +16,6 @@ module internal AssemblyVersionInformation = let [] AssemblyProduct = "Paket" let [] AssemblyCompany = "Paket team" let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." - let [] AssemblyVersion = "5.241.6" - let [] AssemblyFileVersion = "5.241.6" - let [] AssemblyInformationalVersion = "5.241.6" + let [] AssemblyVersion = "5.242.0" + let [] AssemblyFileVersion = "5.242.0" + let [] AssemblyInformationalVersion = "5.242.0" diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index f1809e2f3e..e9fec52b63 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -4,16 +4,16 @@ [assembly: AssemblyTitleAttribute("Paket.Bootstrapper")] [assembly: AssemblyProductAttribute("Paket")] [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] -[assembly: AssemblyVersionAttribute("5.241.6")] -[assembly: AssemblyFileVersionAttribute("5.241.6")] -[assembly: AssemblyInformationalVersionAttribute("5.241.6")] +[assembly: AssemblyVersionAttribute("5.242.0")] +[assembly: AssemblyFileVersionAttribute("5.242.0")] +[assembly: AssemblyInformationalVersionAttribute("5.242.0")] namespace System { internal static class AssemblyVersionInformation { internal const System.String AssemblyTitle = "Paket.Bootstrapper"; internal const System.String AssemblyProduct = "Paket"; internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."; - internal const System.String AssemblyVersion = "5.241.6"; - internal const System.String AssemblyFileVersion = "5.241.6"; - internal const System.String AssemblyInformationalVersion = "5.241.6"; + internal const System.String AssemblyVersion = "5.242.0"; + internal const System.String AssemblyFileVersion = "5.242.0"; + internal const System.String AssemblyInformationalVersion = "5.242.0"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 8501b70d32..30b807b86a 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -6,9 +6,9 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = @@ -16,6 +16,6 @@ module internal AssemblyVersionInformation = let [] AssemblyProduct = "Paket" let [] AssemblyCompany = "Paket team" let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." - let [] AssemblyVersion = "5.241.6" - let [] AssemblyFileVersion = "5.241.6" - let [] AssemblyInformationalVersion = "5.241.6" + let [] AssemblyVersion = "5.242.0" + let [] AssemblyFileVersion = "5.242.0" + let [] AssemblyInformationalVersion = "5.242.0" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 05383ba9c1..854323701f 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -6,9 +6,9 @@ open System.Reflection [] [] [] -[] -[] -[] +[] +[] +[] do () module internal AssemblyVersionInformation = @@ -16,6 +16,6 @@ module internal AssemblyVersionInformation = let [] AssemblyProduct = "Paket" let [] AssemblyCompany = "Paket team" let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." - let [] AssemblyVersion = "5.241.6" - let [] AssemblyFileVersion = "5.241.6" - let [] AssemblyInformationalVersion = "5.241.6" + let [] AssemblyVersion = "5.242.0" + let [] AssemblyFileVersion = "5.242.0" + let [] AssemblyInformationalVersion = "5.242.0"