From 00bc73c04f786e893195937850fe34bdef422363 Mon Sep 17 00:00:00 2001 From: Daniel Abrahamsson Date: Wed, 12 Jan 2022 14:15:27 +0100 Subject: [PATCH 1/2] Enable ResxProvider on net5.0-windows This provides an upgrade path for projects moving from .NET Framework to .NET 5+. --- RELEASE_NOTES.md | 1 + .../FSharp.Configuration.DesignTime.fs | 2 +- .../FSharp.Configuration.DesignTime.fsproj | 8 ++++++-- src/FSharp.Configuration.DesignTime/ResXProvider.fs | 2 +- .../FSharp.Configuration.Runtime.fsproj | 8 ++++++-- src/FSharp.Configuration.Runtime/ResXProvider.Runtime.fs | 2 +- .../FSharp.Configuration.Tests.fsproj | 8 ++++++-- tests/FSharp.Configuration.Tests/ResXProvider.Tests.fs | 2 +- 8 files changed, 23 insertions(+), 10 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index bc2ab051..8fc40a60 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -3,6 +3,7 @@ * Migration from SharpYaml to YamlDotNet * YamlConfigTypeProvider targets net461 and netstandard2.0 * IniFileProvider targets net461 and netstandard2.0 +* ResXProvider targets net461 and net5.0-windows * AppSettingsProvider targets net461 and netstandard2.0 * Dependencies update * Fix bug triggering exception 'xx_ItemType is not comparable' when updating an empty list #158 diff --git a/src/FSharp.Configuration.DesignTime/FSharp.Configuration.DesignTime.fs b/src/FSharp.Configuration.DesignTime/FSharp.Configuration.DesignTime.fs index a5bf948b..ecb0aa5e 100644 --- a/src/FSharp.Configuration.DesignTime/FSharp.Configuration.DesignTime.fs +++ b/src/FSharp.Configuration.DesignTime/FSharp.Configuration.DesignTime.fs @@ -17,7 +17,7 @@ type FSharpConfigurationProvider(cfg: TypeProviderConfig) as this = do this.AddNamespace ( rootNamespace, [ -#if NET461 +#if ENABLE_RESXPROVIDER ResXProvider.typedResources context #endif AppSettingsTypeProvider.typedAppSettings context diff --git a/src/FSharp.Configuration.DesignTime/FSharp.Configuration.DesignTime.fsproj b/src/FSharp.Configuration.DesignTime/FSharp.Configuration.DesignTime.fsproj index eef4c093..d10f1f7f 100644 --- a/src/FSharp.Configuration.DesignTime/FSharp.Configuration.DesignTime.fsproj +++ b/src/FSharp.Configuration.DesignTime/FSharp.Configuration.DesignTime.fsproj @@ -3,7 +3,7 @@ Library - netstandard2.0;net461 + netstandard2.0;net461;net5.0-windows true true true @@ -11,7 +11,11 @@ true - NET461 + ENABLE_RESXPROVIDER + + + true + ENABLE_RESXPROVIDER diff --git a/src/FSharp.Configuration.DesignTime/ResXProvider.fs b/src/FSharp.Configuration.DesignTime/ResXProvider.fs index bd0fd274..ff8e8525 100644 --- a/src/FSharp.Configuration.DesignTime/ResXProvider.fs +++ b/src/FSharp.Configuration.DesignTime/ResXProvider.fs @@ -1,6 +1,6 @@ module FSharp.Configuration.ResXProvider -#if NET461 +#if ENABLE_RESXPROVIDER open System open System.IO diff --git a/src/FSharp.Configuration.Runtime/FSharp.Configuration.Runtime.fsproj b/src/FSharp.Configuration.Runtime/FSharp.Configuration.Runtime.fsproj index 0b731f44..bf962ea4 100644 --- a/src/FSharp.Configuration.Runtime/FSharp.Configuration.Runtime.fsproj +++ b/src/FSharp.Configuration.Runtime/FSharp.Configuration.Runtime.fsproj @@ -5,12 +5,16 @@ Library - netstandard2.0; net461 + netstandard2.0; net461;net5.0-windows true true - NET461 + NET461;ENABLE_RESXPROVIDER + + + true + ENABLE_RESXPROVIDER diff --git a/src/FSharp.Configuration.Runtime/ResXProvider.Runtime.fs b/src/FSharp.Configuration.Runtime/ResXProvider.Runtime.fs index 845781a5..e452718e 100644 --- a/src/FSharp.Configuration.Runtime/ResXProvider.Runtime.fs +++ b/src/FSharp.Configuration.Runtime/ResXProvider.Runtime.fs @@ -1,6 +1,6 @@ module FSharp.Configuration.ResX -#if NET461 +#if ENABLE_RESXPROVIDER open System open System.IO diff --git a/tests/FSharp.Configuration.Tests/FSharp.Configuration.Tests.fsproj b/tests/FSharp.Configuration.Tests/FSharp.Configuration.Tests.fsproj index 882884a4..a99af5e7 100644 --- a/tests/FSharp.Configuration.Tests/FSharp.Configuration.Tests.fsproj +++ b/tests/FSharp.Configuration.Tests/FSharp.Configuration.Tests.fsproj @@ -4,7 +4,7 @@ Exe - net5.0;net461 + net5.0;net461;net5.0-windows FSharp.Configuration.Tests true true @@ -13,7 +13,11 @@ true - NET461 + ENABLE_RESXPROVIDER + + + true + ENABLE_RESXPROVIDER diff --git a/tests/FSharp.Configuration.Tests/ResXProvider.Tests.fs b/tests/FSharp.Configuration.Tests/ResXProvider.Tests.fs index 1c6c115f..46451135 100644 --- a/tests/FSharp.Configuration.Tests/ResXProvider.Tests.fs +++ b/tests/FSharp.Configuration.Tests/ResXProvider.Tests.fs @@ -3,7 +3,7 @@ module FSharp.Configuration.Tests.ResXTests open FSharp.Configuration open Expecto -#if NET461 +#if ENABLE_RESXPROVIDER type Resource1 = ResXProvider<"Resource1.resx"> From 7ec4f671b3854a2a76cefe175f946a2ca6de45fa Mon Sep 17 00:00:00 2001 From: Daniel Abrahamsson Date: Thu, 13 Jan 2022 12:34:22 +0100 Subject: [PATCH 2/2] Include net5.0-windows target in NuGet package --- paket.dependencies | 4 +- paket.lock | 78 +++++++++---------- .../FSharp.Configuration.Runtime.fsproj | 5 ++ .../paket.template | 5 ++ 4 files changed, 50 insertions(+), 42 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 752edd0c..a5fe9fb1 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,5 +1,5 @@ source http://nuget.org/api/v2 -framework: netstandard2.0, net461, net5.0 +framework: netstandard2.0, net461, net5.0-windows redirects: force nuget YamlDotNet @@ -19,4 +19,4 @@ group Test nuget FSharp.Core redirects: force nuget Expecto - nuget System.Resources.Extensions \ No newline at end of file + nuget System.Resources.Extensions diff --git a/paket.lock b/paket.lock index 751a5aa3..4b3de067 100644 --- a/paket.lock +++ b/paket.lock @@ -1,48 +1,46 @@ REDIRECTS: FORCE -RESTRICTION: || (== net461) (== net50) (== netstandard2.0) +RESTRICTION: || (== net461) (== net5.0-windows7.0) (== netstandard2.0) NUGET remote: http://www.nuget.org/api/v2 FSharp.Core (4.7) - Microsoft.NETCore.Platforms (5.0.2) - restriction: || (== net461) (== net50) (&& (== netstandard2.0) (>= net461)) (&& (== netstandard2.0) (>= netcoreapp2.0)) - Microsoft.Win32.SystemEvents (5.0) - restriction: || (&& (== net461) (>= netcoreapp3.0)) (== net50) (&& (== netstandard2.0) (>= netcoreapp3.0)) - Microsoft.NETCore.Platforms (>= 5.0) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (== net50) (&& (== netstandard2.0) (>= netcoreapp2.0)) - NETStandard.Library (2.0.3) - restriction: || (== net461) (&& (== net50) (>= net461)) (&& (== netstandard2.0) (>= net461)) + Microsoft.NETCore.Platforms (5.0.2) - restriction: || (== net461) (&& (== net5.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) + Microsoft.Win32.SystemEvents (6.0) - restriction: || (&& (== net461) (>= netcoreapp3.1)) (== net5.0-windows7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + NETStandard.Library (2.0.3) - restriction: || (== net461) (&& (== net5.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) Microsoft.NETCore.Platforms (>= 1.1) NETStandard.Library.NETFramework (2.0.0-preview2-25405-01) - Microsoft.NETCore.Platforms (>= 2.0.0-preview2-25405-01) - restriction: || (== net461) (&& (== net50) (>= net461)) (&& (== netstandard2.0) (>= net461)) - NETStandard.Library (>= 2.0.0-preview2-25401-01) - restriction: || (== net461) (&& (== net50) (>= net461)) (&& (== netstandard2.0) (>= net461)) - System.Buffers (4.5.1) - restriction: || (&& (== net461) (== net50)) (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1) (>= xamarinios)) (&& (== net50) (< netcoreapp2.1) (>= xamarinmac)) (&& (== net50) (< netcoreapp2.1) (>= xamarintvos)) (&& (== net50) (< netcoreapp2.1) (>= xamarinwatchos)) (&& (== net50) (< netstandard1.1)) (&& (== net50) (< netstandard2.0)) (== netstandard2.0) - System.Configuration.ConfigurationManager (5.0) - System.Security.Cryptography.ProtectedData (>= 5.0) - restriction: || (== net50) (== netstandard2.0) - System.Security.Permissions (>= 5.0) - System.Drawing.Common (5.0.2) - restriction: || (&& (== net461) (>= netcoreapp3.0)) (== net50) (&& (== netstandard2.0) (>= netcoreapp3.0)) - Microsoft.Win32.SystemEvents (>= 5.0) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (&& (== net461) (>= netcoreapp3.0)) (== net50) (&& (== netstandard2.0) (>= netcoreapp2.0)) (&& (== netstandard2.0) (>= netcoreapp3.0)) - System.Memory (4.5.4) - restriction: || (&& (== net461) (== net50)) (&& (== net50) (< netcoreapp2.1)) (== netstandard2.0) - System.Buffers (>= 4.5.1) - restriction: || (== net461) (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netstandard1.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= xamarinios)) (&& (== net50) (>= xamarinmac)) (&& (== net50) (>= xamarintvos)) (&& (== net50) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (&& (== net50) (< netcoreapp2.0)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net461) (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netstandard1.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (&& (== net50) (>= xamarinios)) (&& (== net50) (>= xamarinmac)) (&& (== net50) (>= xamarintvos)) (&& (== net50) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (&& (== net461) (== net50)) (&& (== net50) (< netcoreapp2.0)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (5.0) - restriction: || (&& (== net461) (== net50)) (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netstandard1.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (== netstandard2.0) - System.Security.AccessControl (5.0) - Microsoft.NETCore.Platforms (>= 5.0) - restriction: || (&& (== net461) (>= netcoreapp2.0)) (== net50) (&& (== netstandard2.0) (>= netcoreapp2.0)) + Microsoft.NETCore.Platforms (>= 2.0.0-preview2-25405-01) - restriction: || (== net461) (&& (== net5.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) + NETStandard.Library (>= 2.0.0-preview2-25401-01) - restriction: || (== net461) (&& (== net5.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) + System.Buffers (4.5.1) - restriction: || (&& (== net461) (== net5.0-windows7.0)) (&& (== net461) (>= net6.0)) (&& (== net5.0-windows7.0) (>= monotouch)) (&& (== net5.0-windows7.0) (>= net461)) (&& (== net5.0-windows7.0) (< netcoreapp2.0)) (&& (== net5.0-windows7.0) (< netstandard1.1)) (&& (== net5.0-windows7.0) (< netstandard2.0)) (&& (== net5.0-windows7.0) (>= xamarinios)) (&& (== net5.0-windows7.0) (>= xamarinmac)) (&& (== net5.0-windows7.0) (>= xamarintvos)) (&& (== net5.0-windows7.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Configuration.ConfigurationManager (6.0) + System.Security.Cryptography.ProtectedData (>= 6.0) - restriction: || (&& (== net461) (>= net6.0)) (== net5.0-windows7.0) (== netstandard2.0) + System.Security.Permissions (>= 6.0) + System.Drawing.Common (6.0) - restriction: || (&& (== net461) (>= netcoreapp3.1)) (== net5.0-windows7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + Microsoft.Win32.SystemEvents (>= 6.0) - restriction: || (&& (== net461) (>= netcoreapp3.1)) (== net5.0-windows7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + System.Memory (4.5.4) - restriction: || (&& (== net461) (>= net6.0)) (== net5.0-windows7.0) (== netstandard2.0) + System.Buffers (>= 4.5.1) - restriction: || (== net461) (&& (== net5.0-windows7.0) (>= monotouch)) (&& (== net5.0-windows7.0) (>= net461)) (&& (== net5.0-windows7.0) (< netcoreapp2.0)) (&& (== net5.0-windows7.0) (< netstandard1.1)) (&& (== net5.0-windows7.0) (< netstandard2.0)) (&& (== net5.0-windows7.0) (>= xamarinios)) (&& (== net5.0-windows7.0) (>= xamarinmac)) (&& (== net5.0-windows7.0) (>= xamarintvos)) (&& (== net5.0-windows7.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net461) (< net45) (>= netstandard2.0)) (&& (== net5.0-windows7.0) (< netcoreapp2.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net461) (&& (== net5.0-windows7.0) (>= monotouch)) (&& (== net5.0-windows7.0) (>= net461)) (&& (== net5.0-windows7.0) (< netcoreapp2.0)) (&& (== net5.0-windows7.0) (< netcoreapp2.1)) (&& (== net5.0-windows7.0) (< netstandard1.1)) (&& (== net5.0-windows7.0) (< netstandard2.0)) (&& (== net5.0-windows7.0) (>= uap10.1)) (&& (== net5.0-windows7.0) (>= xamarinios)) (&& (== net5.0-windows7.0) (>= xamarinmac)) (&& (== net5.0-windows7.0) (>= xamarintvos)) (&& (== net5.0-windows7.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Numerics.Vectors (4.5) - restriction: || (&& (== net461) (== net5.0-windows7.0)) (&& (== net461) (>= net6.0)) (&& (== net5.0-windows7.0) (< netcoreapp2.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (5.0) - restriction: || (&& (== net461) (== net5.0-windows7.0)) (&& (== net461) (>= net6.0)) (&& (== net5.0-windows7.0) (>= monotouch)) (&& (== net5.0-windows7.0) (>= net461)) (&& (== net5.0-windows7.0) (< netcoreapp2.0)) (&& (== net5.0-windows7.0) (< netcoreapp2.1)) (&& (== net5.0-windows7.0) (< netstandard1.1)) (&& (== net5.0-windows7.0) (< netstandard2.0)) (&& (== net5.0-windows7.0) (>= uap10.1)) (&& (== net5.0-windows7.0) (>= xamarinios)) (&& (== net5.0-windows7.0) (>= xamarinmac)) (&& (== net5.0-windows7.0) (>= xamarintvos)) (&& (== net5.0-windows7.0) (>= xamarinwatchos)) (== netstandard2.0) + System.Security.AccessControl (6.0) System.Security.Principal.Windows (>= 5.0) - System.Security.Cryptography.ProtectedData (5.0) - restriction: || (== net50) (== netstandard2.0) - System.Memory (>= 4.5.4) - restriction: || (&& (== net461) (< net46) (>= netstandard2.0)) (&& (== net50) (< netcoreapp2.1)) (== netstandard2.0) - System.Security.Permissions (5.0) - System.Security.AccessControl (>= 5.0) - System.Windows.Extensions (>= 5.0) - restriction: || (&& (== net461) (>= netcoreapp3.0)) (== net50) (&& (== netstandard2.0) (>= netcoreapp3.0)) + System.Security.Cryptography.ProtectedData (6.0) - restriction: || (&& (== net461) (>= net6.0)) (== net5.0-windows7.0) (== netstandard2.0) + System.Memory (>= 4.5.4) - restriction: || (== net5.0-windows7.0) (== netstandard2.0) + System.Security.Permissions (6.0) + System.Security.AccessControl (>= 6.0) + System.Windows.Extensions (>= 6.0) - restriction: || (&& (== net461) (>= netcoreapp3.1)) (== net5.0-windows7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) System.Security.Principal.Windows (5.0) - System.Windows.Extensions (5.0) - restriction: || (&& (== net461) (>= netcoreapp3.0)) (== net50) (&& (== netstandard2.0) (>= netcoreapp3.0)) - System.Drawing.Common (>= 5.0) - restriction: || (&& (== net461) (>= netcoreapp3.0)) (== net50) (&& (== netstandard2.0) (>= netcoreapp3.0)) + System.Windows.Extensions (6.0) - restriction: || (&& (== net461) (>= netcoreapp3.1)) (== net5.0-windows7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) + System.Drawing.Common (>= 6.0) - restriction: || (&& (== net461) (>= netcoreapp3.1)) (== net5.0-windows7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) YamlDotNet (11.2.1) GITHUB remote: fsprojects/FSharp.TypeProviders.SDK - src/ProvidedTypes.fs (f4aca36af04aa84b16ec04df6f6bf55ac2f17a73) - src/ProvidedTypes.fsi (f4aca36af04aa84b16ec04df6f6bf55ac2f17a73) - tests/ProvidedTypesTesting.fs (f4aca36af04aa84b16ec04df6f6bf55ac2f17a73) + src/ProvidedTypes.fs (605be1f21a9f173e20b826b862eea0705212ecfe) + src/ProvidedTypes.fsi (605be1f21a9f173e20b826b862eea0705212ecfe) + tests/ProvidedTypesTesting.fs (605be1f21a9f173e20b826b862eea0705212ecfe) GROUP Test REDIRECTS: FORCE -RESTRICTION: || (== net461) (== net50) +RESTRICTION: || (== net461) (== net5.0) NUGET remote: https://www.nuget.org/api/v2 Expecto (9.0.2) @@ -50,12 +48,12 @@ NUGET Mono.Cecil (>= 0.11.2) FSharp.Core (5.0.2) - redirects: force Mono.Cecil (0.11.4) - System.Buffers (4.5.1) - restriction: || (== net461) (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1) (>= xamarinios)) (&& (== net50) (< netcoreapp2.1) (>= xamarinmac)) (&& (== net50) (< netcoreapp2.1) (>= xamarintvos)) (&& (== net50) (< netcoreapp2.1) (>= xamarinwatchos)) (&& (== net50) (< netstandard1.1)) (&& (== net50) (< netstandard2.0)) - System.Memory (4.5.4) - restriction: || (== net461) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.1)) - System.Buffers (>= 4.5.1) - restriction: || (== net461) (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netstandard1.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= xamarinios)) (&& (== net50) (>= xamarinmac)) (&& (== net50) (>= xamarintvos)) (&& (== net50) (>= xamarinwatchos)) - System.Numerics.Vectors (>= 4.5) - restriction: || (== net461) (&& (== net50) (>= net461)) - System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net461) (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netstandard1.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (&& (== net50) (>= xamarinios)) (&& (== net50) (>= xamarinmac)) (&& (== net50) (>= xamarintvos)) (&& (== net50) (>= xamarinwatchos)) - System.Numerics.Vectors (4.5) - restriction: || (== net461) (&& (== net50) (>= net461)) + System.Buffers (4.5.1) - restriction: || (== net461) (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netcoreapp2.1) (>= xamarinios)) (&& (== net5.0) (< netcoreapp2.1) (>= xamarinmac)) (&& (== net5.0) (< netcoreapp2.1) (>= xamarintvos)) (&& (== net5.0) (< netcoreapp2.1) (>= xamarinwatchos)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) + System.Memory (4.5.4) - restriction: || (== net461) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.1)) + System.Buffers (>= 4.5.1) - restriction: || (== net461) (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= xamarinios)) (&& (== net5.0) (>= xamarinmac)) (&& (== net5.0) (>= xamarintvos)) (&& (== net5.0) (>= xamarinwatchos)) + System.Numerics.Vectors (>= 4.5) - restriction: || (== net461) (&& (== net5.0) (>= net461)) + System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net461) (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) (&& (== net5.0) (>= xamarinios)) (&& (== net5.0) (>= xamarinmac)) (&& (== net5.0) (>= xamarintvos)) (&& (== net5.0) (>= xamarinwatchos)) + System.Numerics.Vectors (4.5) - restriction: || (== net461) (&& (== net5.0) (>= net461)) System.Resources.Extensions (5.0) - System.Memory (>= 4.5.4) - restriction: || (== net461) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.1)) - System.Runtime.CompilerServices.Unsafe (5.0) - restriction: || (== net461) (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netstandard1.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) + System.Memory (>= 4.5.4) - restriction: || (== net461) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.1)) + System.Runtime.CompilerServices.Unsafe (5.0) - restriction: || (== net461) (&& (== net5.0) (>= monotouch)) (&& (== net5.0) (>= net461)) (&& (== net5.0) (< netcoreapp2.0)) (&& (== net5.0) (< netcoreapp2.1)) (&& (== net5.0) (< netstandard1.1)) (&& (== net5.0) (< netstandard2.0)) (&& (== net5.0) (>= uap10.1)) diff --git a/src/FSharp.Configuration.Runtime/FSharp.Configuration.Runtime.fsproj b/src/FSharp.Configuration.Runtime/FSharp.Configuration.Runtime.fsproj index bf962ea4..8a86f6d8 100644 --- a/src/FSharp.Configuration.Runtime/FSharp.Configuration.Runtime.fsproj +++ b/src/FSharp.Configuration.Runtime/FSharp.Configuration.Runtime.fsproj @@ -47,6 +47,7 @@ + @@ -57,6 +58,10 @@ + + + + \ No newline at end of file diff --git a/src/FSharp.Configuration.Runtime/paket.template b/src/FSharp.Configuration.Runtime/paket.template index c0ad1b6d..8fd66b67 100644 --- a/src/FSharp.Configuration.Runtime/paket.template +++ b/src/FSharp.Configuration.Runtime/paket.template @@ -29,13 +29,18 @@ files bin/Release/net461/YamlDotNet.dll ==> lib/net461 bin/Release/netstandard2.0/FSharp.Configuration.Runtime.* ==> lib/netstandard2.0 bin/Release/netstandard2.0/YamlDotNet.dll ==> lib/netstandard2.0 + bin/Release/net5.0-windows/FSharp.Configuration.Runtime.* ==> lib/net5.0-windows + bin/Release/net5.0-windows/YamlDotNet.dll ==> lib/net5.0-windows bin/Release/typeproviders/fsharp41/netstandard2.0/*.dll ==> typeproviders/fsharp41/netstandard2.0 bin/Release/typeproviders/fsharp41/net461/*.dll ==> typeproviders/fsharp41/net461 + bin/Release/typeproviders/fsharp41/net5.0-windows/*.dll ==> typeproviders/fsharp41/net5.0-windows dependencies framework: netstandard20 FSharp.Core >= LOCKEDVERSION framework: net461 FSharp.Core >= LOCKEDVERSION + framework: net5.0-windows + FSharp.Core >= LOCKEDVERSION references FSharp.Configuration.Runtime.dll YamlDotNet.dll