Skip to content

Enable ResxProvider on net5.0-windows #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Enable ResxProvider on net5.0-windows #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00bc73c
Enable ResxProvider on net5.0-windows
danabr Jan 12, 2022
7ec4f67
Include net5.0-windows target in NuGet package
danabr Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -19,4 +19,4 @@ group Test

nuget FSharp.Core redirects: force
nuget Expecto
nuget System.Resources.Extensions
nuget System.Resources.Extensions
78 changes: 38 additions & 40 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,59 @@
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)
FSharp.Core (>= 4.6)
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))
2 changes: 1 addition & 1 deletion src/FSharp.Configuration.DesignTime/FSharp.Configuration.DesignTime.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions src/FSharp.Configuration.DesignTime/FSharp.Configuration.DesignTime.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
<Import Project="..\..\netfx.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;net5.0-windows</TargetFrameworks>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
<DefineConstants>NET461</DefineConstants>
<DefineConstants>ENABLE_RESXPROVIDER</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
<DefineConstants>ENABLE_RESXPROVIDER</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Web" Condition="'$(TargetFramework)' == 'net461'" />
Expand Down
2 changes: 1 addition & 1 deletion src/FSharp.Configuration.DesignTime/ResXProvider.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module FSharp.Configuration.ResXProvider

#if NET461
#if ENABLE_RESXPROVIDER

open System
open System.IO
Expand Down
13 changes: 11 additions & 2 deletions src/FSharp.Configuration.Runtime/FSharp.Configuration.Runtime.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
<Import Project="..\..\netfx.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netstandard2.0; net461</TargetFrameworks>
<TargetFrameworks>netstandard2.0; net461;net5.0-windows</TargetFrameworks>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
<DefineConstants>NET461</DefineConstants>
<DefineConstants>NET461;ENABLE_RESXPROVIDER</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
<UseWindowsForms>true</UseWindowsForms>
<DefineConstants>ENABLE_RESXPROVIDER</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Web" Condition="'$(TargetFramework)' == 'net461'" />
Expand Down Expand Up @@ -43,6 +47,7 @@
<MSBuild Projects="..\FSharp.Configuration.DesignTime\FSharp.Configuration.DesignTime.fsproj" Targets="Restore" />
<MSBuild Projects="..\FSharp.Configuration.DesignTime\FSharp.Configuration.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0" />
<MSBuild Projects="..\FSharp.Configuration.DesignTime\FSharp.Configuration.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net461" />
<MSBuild Projects="..\FSharp.Configuration.DesignTime\FSharp.Configuration.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net5.0-windows" />
</Target>
<Target Name="AfterBuild">
<CreateItem Include="..\FSharp.Configuration.DesignTime\bin\$(Configuration)\net461\*.dll;..\FSharp.Configuration.DesignTime\bin\$(Configuration)\net461\*.pdb">
Expand All @@ -53,6 +58,10 @@
<Output TaskParameter="Include" ItemName="DesignTimeBinaries3" />
</CreateItem>
<Copy SourceFiles="@(DesignTimeBinaries3)" DestinationFolder="$(OutputPath)/../typeproviders/fsharp41/netstandard2.0" />
<CreateItem Include="..\FSharp.Configuration.DesignTime\bin\$(Configuration)\net5.0-windows\*.dll;..\FSharp.Configuration.DesignTime\bin\$(Configuration)\net5.0-windows\*.pdb">
<Output TaskParameter="Include" ItemName="DesignTimeBinaries4" />
</CreateItem>
<Copy SourceFiles="@(DesignTimeBinaries4)" DestinationFolder="$(OutputPath)/../typeproviders/fsharp41/net5.0-windows" />
</Target>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
2 changes: 1 addition & 1 deletion src/FSharp.Configuration.Runtime/ResXProvider.Runtime.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module FSharp.Configuration.ResX

#if NET461
#if ENABLE_RESXPROVIDER

open System
open System.IO
Expand Down
Loading