From 45f128b8512aa3ce5ae7763856fb65976f7f00de Mon Sep 17 00:00:00 2001 From: Michal Kovac Date: Wed, 11 Nov 2020 13:32:10 +0100 Subject: [PATCH 1/7] add net5 windows dependent target profiles --- .../Versioning/FrameworkHandling.fs | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/src/Paket.Core/Versioning/FrameworkHandling.fs b/src/Paket.Core/Versioning/FrameworkHandling.fs index e924e3b395..63a944dbe8 100644 --- a/src/Paket.Core/Versioning/FrameworkHandling.fs +++ b/src/Paket.Core/Versioning/FrameworkHandling.fs @@ -55,6 +55,63 @@ type DotNetStandardVersion = | "2.1" -> Some(DotNetStandardVersion.V2_1) | _ -> None +[] +type Net5WindowsVersion = + | V7_0 + | V8_0 + | V10_0_17763_0 + | V10_0_18362_0 + | V10_0_19041_0 + override this.ToString() = + match this with + | V7_0 -> "7.0" + | V8_0 -> "8.0" + | V10_0_17763_0 -> "10.0.17763.0" + | V10_0_18362_0 -> "10.0.18362.0" + | V10_0_19041_0 -> "10.0.19041.0" + + static member TryParse s = + match s with + | "7.0" -> Some Net5WindowsVersion.V7_0 + | "8.0" -> Some Net5WindowsVersion.V8_0 + | "10.0.17763.0" -> Some Net5WindowsVersion.V10_0_17763_0 + | "10.0.18362.0" -> Some Net5WindowsVersion.V10_0_18362_0 + | "10.0.19041.0" -> Some Net5WindowsVersion.V10_0_19041_0 + | _ -> None + +[] +type Net5Os = + | Android + | IOs + | MacOs + | TvOs + | WatchOs + | Windows + | WindowsWithVersion of Net5WindowsVersion + override this.ToString() = + match this with + | Android -> "android" + | IOs -> "ios" + | MacOs -> "macos" + | TvOs -> "tvos" + | WatchOs -> "watchos" + | Windows -> "windows" + | WindowsWithVersion v -> "windows" + v.ToString() + + static member TryParse s = + match s with + | "android" -> Some Net5Os.Android + | "ios" -> Some Net5Os.Android + | "macos" -> Some Net5Os.Android + | "tvos" -> Some Net5Os.Android + | "watchos" -> Some Net5Os.Android + | "windows" -> Some Net5Os.Android + | _ when s.StartsWith("windows") -> + let versionPart = s.Substring ("windows".Length) + Net5WindowsVersion.TryParse(versionPart) + |> Option.map Net5Os.WindowsWithVersion + | _ -> None + [] /// The Framework version. // Each time a new version is added NuGetPackageCache.CurrentCacheVersion should be bumped. @@ -79,6 +136,7 @@ type FrameworkVersion = | V4_7_2 | V4_8 | V5 + | V5WithOs of Net5Os override this.ToString() = match this with | V1 -> "v1.0" @@ -101,6 +159,7 @@ type FrameworkVersion = | V4_7_2 -> "v4.7.2" | V4_8 -> "v4.8" | V5 -> "v5.0" + | V5WithOs o-> "v5.0-" + o.ToString() member this.ShortString() = match this with @@ -124,6 +183,7 @@ type FrameworkVersion = | FrameworkVersion.V4_7_2 -> "472" | FrameworkVersion.V4_8 -> "48" | FrameworkVersion.V5 -> "5.0" + | FrameworkVersion.V5WithOs o -> "5.0-" + o.ToString() static member TryParse s = match s with @@ -147,6 +207,10 @@ type FrameworkVersion = | "4.7.2" -> Some FrameworkVersion.V4_7_2 | "4.8" -> Some FrameworkVersion.V4_8 | "5.0" | "5" -> Some FrameworkVersion.V5 + | _ when s.StartsWith("5.0") -> + let osPart = s.Substring ("5.0".Length) + Net5Os.TryParse(osPart) + |> Option.map FrameworkVersion.V5WithOs | _ -> None [] @@ -683,6 +747,8 @@ type FrameworkIdentifier = | DotNetFramework FrameworkVersion.V4_7_2 -> [ DotNetFramework FrameworkVersion.V4_7_1 ] | DotNetFramework FrameworkVersion.V4_8 -> [ DotNetFramework FrameworkVersion.V4_7_2 ] | DotNetFramework FrameworkVersion.V5 -> [ DotNetCoreApp DotNetCoreAppVersion.V3_1; DotNetStandard DotNetStandardVersion.V2_1 ] + | DotNetFramework (FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(_))) -> [ DotNetFramework (FrameworkVersion.V5WithOs(Net5Os.Windows)) ] + | DotNetFramework (FrameworkVersion.V5WithOs(_)) -> [ DotNetFramework FrameworkVersion.V5 ] | DotNetStandard DotNetStandardVersion.V1_0 -> [ ] | DotNetStandard DotNetStandardVersion.V1_1 -> [ DotNetStandard DotNetStandardVersion.V1_0 ] | DotNetStandard DotNetStandardVersion.V1_2 -> [ DotNetStandard DotNetStandardVersion.V1_1 ] @@ -1196,6 +1262,17 @@ module KnownTargetProfiles = FrameworkVersion.V4_7_2 FrameworkVersion.V4_8 FrameworkVersion.V5 + FrameworkVersion.V5WithOs(Net5Os.Android) + FrameworkVersion.V5WithOs(Net5Os.IOs) + FrameworkVersion.V5WithOs(Net5Os.MacOs) + FrameworkVersion.V5WithOs(Net5Os.TvOs) + FrameworkVersion.V5WithOs(Net5Os.WatchOs) + FrameworkVersion.V5WithOs(Net5Os.Windows) + FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(Net5WindowsVersion.V7_0)) + FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(Net5WindowsVersion.V8_0)) + FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(Net5WindowsVersion.V10_0_17763_0)) + FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(Net5WindowsVersion.V10_0_18362_0)) + FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(Net5WindowsVersion.V10_0_19041_0)) ] let DotNetFrameworkIdentifiers = From 1daaed0e8acdd28e7eebebcddca365b95cfefddf Mon Sep 17 00:00:00 2001 From: Michal Kovac Date: Wed, 11 Nov 2020 14:04:47 +0100 Subject: [PATCH 2/7] fix tests for net5.0 with OS --- tests/Paket.Tests/InstallModel/Xml/RxXaml.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs | 2 +- tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs index 047efdfc25..b994e00247 100644 --- a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs +++ b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs @@ -33,7 +33,7 @@ let expected = """ - + ..\..\..\Rx-XAML\lib\portable-win81+wpa81\System.Reactive.Windows.Threading.dll diff --git a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs index b9bd8adacf..16097cbbd7 100644 --- a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs +++ b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs @@ -20,7 +20,7 @@ let expectedPropertyDefinitionNodes = """ <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio - + <__paket__xunit_runner_visualstudio_props>portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.runner.visualstudio diff --git a/tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs b/tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs index 854bbd0f9b..4aa2fb0eec 100644 --- a/tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs +++ b/tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs @@ -22,7 +22,7 @@ let ``Check that lists are updated``() = Assert.Fail (sprintf "Case '%s' was not found in KnownTargetProfiles.Versions for '%s'" case.Name typeof<'t>.Name) foundCase) |> shouldEqual true - if l.Length <> cases.Length then + if l.Length < cases.Length then Assert.Fail (sprintf "KnownTargetProfiles. doesnt't match number of cases for '%s'." typeof<'t>.Name) let checkList (l:'t list) = let tagReader = FSharp.Reflection.FSharpValue.PreComputeUnionTagReader(typeof<'t>) From 31d833755f35a9cd6a823d7d6660d48dfc07f269 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 12 Nov 2020 08:48:21 +0100 Subject: [PATCH 3/7] RELEASE_NOTES --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index efa7d2e446..4200886a11 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -#### 6.0.0-alpha051 - 2020-11-08 +#### 6.0.0-alpha052 - 2020-11-12 * Full .NET Core / SDK compatible version * Support for XCode * Support for .net5.0 From a7a62251c7404692e38cbdbabd90a6d817bf6583 Mon Sep 17 00:00:00 2001 From: Michal Kovac Date: Wed, 11 Nov 2020 13:32:10 +0100 Subject: [PATCH 4/7] add net5 windows dependent target profiles --- .../Versioning/FrameworkHandling.fs | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/src/Paket.Core/Versioning/FrameworkHandling.fs b/src/Paket.Core/Versioning/FrameworkHandling.fs index 8f876e02b0..f126950bff 100644 --- a/src/Paket.Core/Versioning/FrameworkHandling.fs +++ b/src/Paket.Core/Versioning/FrameworkHandling.fs @@ -55,6 +55,63 @@ type DotNetStandardVersion = | "2.1" -> Some(DotNetStandardVersion.V2_1) | _ -> None +[] +type Net5WindowsVersion = + | V7_0 + | V8_0 + | V10_0_17763_0 + | V10_0_18362_0 + | V10_0_19041_0 + override this.ToString() = + match this with + | V7_0 -> "7.0" + | V8_0 -> "8.0" + | V10_0_17763_0 -> "10.0.17763.0" + | V10_0_18362_0 -> "10.0.18362.0" + | V10_0_19041_0 -> "10.0.19041.0" + + static member TryParse s = + match s with + | "7.0" -> Some Net5WindowsVersion.V7_0 + | "8.0" -> Some Net5WindowsVersion.V8_0 + | "10.0.17763.0" -> Some Net5WindowsVersion.V10_0_17763_0 + | "10.0.18362.0" -> Some Net5WindowsVersion.V10_0_18362_0 + | "10.0.19041.0" -> Some Net5WindowsVersion.V10_0_19041_0 + | _ -> None + +[] +type Net5Os = + | Android + | IOs + | MacOs + | TvOs + | WatchOs + | Windows + | WindowsWithVersion of Net5WindowsVersion + override this.ToString() = + match this with + | Android -> "android" + | IOs -> "ios" + | MacOs -> "macos" + | TvOs -> "tvos" + | WatchOs -> "watchos" + | Windows -> "windows" + | WindowsWithVersion v -> "windows" + v.ToString() + + static member TryParse s = + match s with + | "android" -> Some Net5Os.Android + | "ios" -> Some Net5Os.Android + | "macos" -> Some Net5Os.Android + | "tvos" -> Some Net5Os.Android + | "watchos" -> Some Net5Os.Android + | "windows" -> Some Net5Os.Android + | _ when s.StartsWith("windows") -> + let versionPart = s.Substring ("windows".Length) + Net5WindowsVersion.TryParse(versionPart) + |> Option.map Net5Os.WindowsWithVersion + | _ -> None + [] /// The Framework version. // Each time a new version is added NuGetPackageCache.CurrentCacheVersion should be bumped. @@ -79,6 +136,7 @@ type FrameworkVersion = | V4_7_2 | V4_8 | V5 + | V5WithOs of Net5Os override this.ToString() = match this with | V1 -> "v1.0" @@ -101,6 +159,7 @@ type FrameworkVersion = | V4_7_2 -> "v4.7.2" | V4_8 -> "v4.8" | V5 -> "v5.0" + | V5WithOs o-> "v5.0-" + o.ToString() member this.ShortString() = match this with @@ -124,6 +183,7 @@ type FrameworkVersion = | FrameworkVersion.V4_7_2 -> "472" | FrameworkVersion.V4_8 -> "48" | FrameworkVersion.V5 -> "5.0" + | FrameworkVersion.V5WithOs o -> "5.0-" + o.ToString() static member TryParse s = match s with @@ -147,6 +207,10 @@ type FrameworkVersion = | "4.7.2" -> Some FrameworkVersion.V4_7_2 | "4.8" -> Some FrameworkVersion.V4_8 | "5.0" | "5" -> Some FrameworkVersion.V5 + | _ when s.StartsWith("5.0") -> + let osPart = s.Substring ("5.0".Length) + Net5Os.TryParse(osPart) + |> Option.map FrameworkVersion.V5WithOs | _ -> None [] @@ -657,6 +721,8 @@ type FrameworkIdentifier = | DotNetFramework FrameworkVersion.V4_7_2 -> [ DotNetFramework FrameworkVersion.V4_7_1 ] | DotNetFramework FrameworkVersion.V4_8 -> [ DotNetFramework FrameworkVersion.V4_7_2 ] | DotNetFramework FrameworkVersion.V5 -> [ DotNetCoreApp DotNetCoreAppVersion.V3_1; DotNetStandard DotNetStandardVersion.V2_1 ] + | DotNetFramework (FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(_))) -> [ DotNetFramework (FrameworkVersion.V5WithOs(Net5Os.Windows)) ] + | DotNetFramework (FrameworkVersion.V5WithOs(_)) -> [ DotNetFramework FrameworkVersion.V5 ] | DotNetStandard DotNetStandardVersion.V1_0 -> [ ] | DotNetStandard DotNetStandardVersion.V1_1 -> [ DotNetStandard DotNetStandardVersion.V1_0 ] | DotNetStandard DotNetStandardVersion.V1_2 -> [ DotNetStandard DotNetStandardVersion.V1_1 ] @@ -1167,6 +1233,17 @@ module KnownTargetProfiles = FrameworkVersion.V4_7_2 FrameworkVersion.V4_8 FrameworkVersion.V5 + FrameworkVersion.V5WithOs(Net5Os.Android) + FrameworkVersion.V5WithOs(Net5Os.IOs) + FrameworkVersion.V5WithOs(Net5Os.MacOs) + FrameworkVersion.V5WithOs(Net5Os.TvOs) + FrameworkVersion.V5WithOs(Net5Os.WatchOs) + FrameworkVersion.V5WithOs(Net5Os.Windows) + FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(Net5WindowsVersion.V7_0)) + FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(Net5WindowsVersion.V8_0)) + FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(Net5WindowsVersion.V10_0_17763_0)) + FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(Net5WindowsVersion.V10_0_18362_0)) + FrameworkVersion.V5WithOs(Net5Os.WindowsWithVersion(Net5WindowsVersion.V10_0_19041_0)) ] let DotNetFrameworkIdentifiers = From 460610d1dea36bffb70d25d5abafe5c6e18d6415 Mon Sep 17 00:00:00 2001 From: Michal Kovac Date: Wed, 11 Nov 2020 14:04:47 +0100 Subject: [PATCH 5/7] fix tests for net5.0 with OS --- tests/Paket.Tests/InstallModel/Xml/RxXaml.fs | 2 +- tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs | 2 +- tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs index 047efdfc25..b994e00247 100644 --- a/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs +++ b/tests/Paket.Tests/InstallModel/Xml/RxXaml.fs @@ -33,7 +33,7 @@ let expected = """ - + ..\..\..\Rx-XAML\lib\portable-win81+wpa81\System.Reactive.Windows.Threading.dll diff --git a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs index b9bd8adacf..16097cbbd7 100644 --- a/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs +++ b/tests/Paket.Tests/InstallModel/Xml/xunit.runner.fs @@ -20,7 +20,7 @@ let expectedPropertyDefinitionNodes = """ <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio - + <__paket__xunit_runner_visualstudio_props>portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.runner.visualstudio diff --git a/tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs b/tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs index 854bbd0f9b..4aa2fb0eec 100644 --- a/tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs +++ b/tests/Paket.Tests/Versioning/PlatformMatchingSpecs.fs @@ -22,7 +22,7 @@ let ``Check that lists are updated``() = Assert.Fail (sprintf "Case '%s' was not found in KnownTargetProfiles.Versions for '%s'" case.Name typeof<'t>.Name) foundCase) |> shouldEqual true - if l.Length <> cases.Length then + if l.Length < cases.Length then Assert.Fail (sprintf "KnownTargetProfiles. doesnt't match number of cases for '%s'." typeof<'t>.Name) let checkList (l:'t list) = let tagReader = FSharp.Reflection.FSharpValue.PreComputeUnionTagReader(typeof<'t>) From ccb3091ff5c1d853b3b258f5766a851b5fb9e30b Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 12 Nov 2020 08:55:16 +0100 Subject: [PATCH 6/7] Bump version to 5.253.0 --- 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 ++++++------ 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e46f685192..bf01789296 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 5.253.0 - 2020-11-08 +* .NET5 OS dependent frameworks - https://github.com/fsprojects/Paket/pull/3934 + #### 5.252.0 - 2020-11-08 * Fix removal of duplicate nodes diff --git a/src/LockFileComparer/AssemblyInfo.fs b/src/LockFileComparer/AssemblyInfo.fs index a7d877f716..52c2dc4211 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.252.0" - let [] AssemblyFileVersion = "5.252.0" - let [] AssemblyInformationalVersion = "5.252.0" + let [] AssemblyVersion = "5.253.0" + let [] AssemblyFileVersion = "5.253.0" + let [] AssemblyInformationalVersion = "5.253.0" diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 93206966ef..a4e122592f 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.252.0")] -[assembly: AssemblyFileVersionAttribute("5.252.0")] -[assembly: AssemblyInformationalVersionAttribute("5.252.0")] +[assembly: AssemblyVersionAttribute("5.253.0")] +[assembly: AssemblyFileVersionAttribute("5.253.0")] +[assembly: AssemblyInformationalVersionAttribute("5.253.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.252.0"; - internal const System.String AssemblyFileVersion = "5.252.0"; - internal const System.String AssemblyInformationalVersion = "5.252.0"; + internal const System.String AssemblyVersion = "5.253.0"; + internal const System.String AssemblyFileVersion = "5.253.0"; + internal const System.String AssemblyInformationalVersion = "5.253.0"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 208276746b..2d685df498 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.252.0" - let [] AssemblyFileVersion = "5.252.0" - let [] AssemblyInformationalVersion = "5.252.0" + let [] AssemblyVersion = "5.253.0" + let [] AssemblyFileVersion = "5.253.0" + let [] AssemblyInformationalVersion = "5.253.0" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index d61ca6c353..d41d9d9617 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.252.0" - let [] AssemblyFileVersion = "5.252.0" - let [] AssemblyInformationalVersion = "5.252.0" + let [] AssemblyVersion = "5.253.0" + let [] AssemblyFileVersion = "5.253.0" + let [] AssemblyInformationalVersion = "5.253.0" From a0d50b69c52d386cc7084c377ade392b85b0d206 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Thu, 12 Nov 2020 09:02:09 +0100 Subject: [PATCH 7/7] Bump version to 6.0.0-alpha053 --- src/FSharp.DependencyManager.Paket/AssemblyInfo.fs | 4 ++-- src/LockFileComparer/AssemblyInfo.fs | 4 ++-- src/Paket.Bootstrapper/Properties/AssemblyInfo.cs | 4 ++-- src/Paket.Core/AssemblyInfo.fs | 4 ++-- src/Paket/AssemblyInfo.fs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/FSharp.DependencyManager.Paket/AssemblyInfo.fs b/src/FSharp.DependencyManager.Paket/AssemblyInfo.fs index ca657536f5..239f112a64 100644 --- a/src/FSharp.DependencyManager.Paket/AssemblyInfo.fs +++ b/src/FSharp.DependencyManager.Paket/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "6.0.0" let [] AssemblyFileVersion = "6.0.0" - let [] AssemblyInformationalVersion = "6.0.0-alpha051" + let [] AssemblyInformationalVersion = "6.0.0-alpha053" diff --git a/src/LockFileComparer/AssemblyInfo.fs b/src/LockFileComparer/AssemblyInfo.fs index 359a21919c..e88448483d 100644 --- a/src/LockFileComparer/AssemblyInfo.fs +++ b/src/LockFileComparer/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "6.0.0" let [] AssemblyFileVersion = "6.0.0" - let [] AssemblyInformationalVersion = "6.0.0-alpha051" + let [] AssemblyInformationalVersion = "6.0.0-alpha053" diff --git a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs index 9cf46873ce..4417359e09 100644 --- a/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs +++ b/src/Paket.Bootstrapper/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ [assembly: AssemblyDescriptionAttribute("A dependency manager for .NET with support for NuGet packages and git repositories.")] [assembly: AssemblyVersionAttribute("6.0.0")] [assembly: AssemblyFileVersionAttribute("6.0.0")] -[assembly: AssemblyInformationalVersionAttribute("6.0.0-alpha051")] +[assembly: AssemblyInformationalVersionAttribute("6.0.0-alpha053")] namespace System { internal static class AssemblyVersionInformation { internal const System.String AssemblyTitle = "Paket.Bootstrapper"; @@ -14,6 +14,6 @@ internal static class AssemblyVersionInformation { internal const System.String AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories."; internal const System.String AssemblyVersion = "6.0.0"; internal const System.String AssemblyFileVersion = "6.0.0"; - internal const System.String AssemblyInformationalVersion = "6.0.0-alpha051"; + internal const System.String AssemblyInformationalVersion = "6.0.0-alpha053"; } } diff --git a/src/Paket.Core/AssemblyInfo.fs b/src/Paket.Core/AssemblyInfo.fs index 28f7988cd7..54f656f3fb 100644 --- a/src/Paket.Core/AssemblyInfo.fs +++ b/src/Paket.Core/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "6.0.0" let [] AssemblyFileVersion = "6.0.0" - let [] AssemblyInformationalVersion = "6.0.0-alpha051" + let [] AssemblyInformationalVersion = "6.0.0-alpha053" diff --git a/src/Paket/AssemblyInfo.fs b/src/Paket/AssemblyInfo.fs index 241bf904c1..5ec392e50d 100644 --- a/src/Paket/AssemblyInfo.fs +++ b/src/Paket/AssemblyInfo.fs @@ -8,7 +8,7 @@ open System.Reflection [] [] [] -[] +[] do () module internal AssemblyVersionInformation = @@ -18,4 +18,4 @@ module internal AssemblyVersionInformation = let [] AssemblyDescription = "A dependency manager for .NET with support for NuGet packages and git repositories." let [] AssemblyVersion = "6.0.0" let [] AssemblyFileVersion = "6.0.0" - let [] AssemblyInformationalVersion = "6.0.0-alpha051" + let [] AssemblyInformationalVersion = "6.0.0-alpha053"