Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,20 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
dotnet: [6.0.400]
dotnet6: [6.0.400]
dotnet8: [8.0.400]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v1
- name: Setup .NET Core
- name: Setup .NET Core 6 (for build)
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ matrix.dotnet }}
dotnet-version: ${{ matrix.dotnet6 }}
- name: Setup .NET Core 8
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ matrix.dotnet8 }}
- name: Install local tools
run: dotnet tool restore
- name: Paket Restore
Expand Down
3 changes: 2 additions & 1 deletion build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ Target.create "RunTests" (fun _ ->
{ r with
WorkingDirectory = "tests/FSharp.Configuration.Tests/"
})
"run"
//"run --framework net48"
"run --framework net8.0"
"")

Target.create "NuGet" (fun _ ->
Expand Down
6 changes: 0 additions & 6 deletions global.json

This file was deleted.

12 changes: 6 additions & 6 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
version 8.1.0
source https://api.nuget.org/v3/index.json
framework: net6.0, netstandard2.0
storage: none

nuget YamlDotNet
nuget FSharp.Core 4.7.2
nuget FSharp.Core 8.0.301

nuget System.Configuration.ConfigurationManager
nuget System.Configuration.ConfigurationManager 8.0.1
nuget NETStandard.Library.NETFramework

github fsprojects/FSharp.TypeProviders.SDK src/ProvidedTypes.fs
Expand All @@ -13,9 +14,8 @@ github fsprojects/FSharp.TypeProviders.SDK tests/ProvidedTypesTesting.fs

group Test
source https://api.nuget.org/v3/index.json
framework: net6.0

nuget FSharp.Core redirects: force
nuget Expecto
nuget System.Configuration.ConfigurationManager redirects: force
nuget Expecto 9.0.4
nuget System.Configuration.ConfigurationManager 8.0.1 redirects: force
nuget System.Resources.Extensions
106 changes: 59 additions & 47 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -1,57 +1,69 @@
RESTRICTION: || (== net6.0) (== netstandard2.0)
STORAGE: NONE
NUGET
remote: https://api.nuget.org/v3/index.json
FSharp.Core (4.7.2)
Microsoft.Win32.SystemEvents (6.0.1) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
FSharp.Core (8.0.301)
Microsoft.NETCore.Platforms (7.0.4) - restriction: >= net461
NETStandard.Library (2.0.3) - restriction: >= net461
Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (>= net45) (< netstandard1.3)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4)) (>= net461) (>= netcoreapp2.0) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8) (< win8)) (&& (< netstandard1.0) (< portable-net45+win8) (>= portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= win8)) (&& (< netstandard1.3) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (>= uap10.1) (>= wp8)
NETStandard.Library.NETFramework (2.0.0-preview2-25405-01)
System.Buffers (4.5.1) - restriction: == netstandard2.0
System.Configuration.ConfigurationManager (6.0.1)
System.Security.Cryptography.ProtectedData (>= 6.0)
System.Security.Permissions (>= 6.0)
System.Drawing.Common (6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
Microsoft.Win32.SystemEvents (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
System.Memory (4.5.5) - restriction: == netstandard2.0
System.Buffers (>= 4.5.1) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net6.0) (< netcoreapp2.0)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (4.5) - restriction: == netstandard2.0
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: == netstandard2.0
System.Security.AccessControl (6.0)
System.Security.Principal.Windows (>= 5.0) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
System.Security.Cryptography.ProtectedData (6.0)
System.Memory (>= 4.5.4) - restriction: == netstandard2.0
System.Security.Permissions (6.0)
System.Security.AccessControl (>= 6.0)
System.Windows.Extensions (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
System.Security.Principal.Windows (5.0) - restriction: || (&& (== net6.0) (>= net461)) (== netstandard2.0)
System.Windows.Extensions (6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
System.Drawing.Common (>= 6.0) - restriction: || (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
Microsoft.NETCore.Platforms (>= 2.0.0-preview2-25405-01) - restriction: >= net461
NETStandard.Library (>= 2.0.0-preview2-25401-01) - restriction: >= net461
System.Buffers (4.5.1) - restriction: || (&& (>= monoandroid) (>= net6.0) (< netstandard1.1)) (&& (>= monoandroid) (< netstandard1.1) (>= netstandard2.0)) (&& (< monoandroid) (>= net6.0) (< netstandard1.1)) (&& (< monoandroid) (>= net6.0) (< netstandard2.0)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= net6.0)) (&& (>= monotouch) (>= netstandard2.0)) (&& (>= net45) (>= net6.0) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (&& (>= net461) (< net462) (>= netstandard2.0)) (&& (>= net461) (>= net6.0)) (&& (>= net6.0) (< net8.0) (>= xamarintvos)) (&& (>= net6.0) (< net8.0) (>= xamarinwatchos)) (&& (>= net6.0) (< netcoreapp2.0)) (&& (>= net6.0) (< netstandard1.1) (>= win8)) (&& (>= net6.0) (< netstandard2.0) (>= wpa81)) (&& (< net8.0) (>= netstandard2.0) (>= xamarintvos)) (&& (< net8.0) (>= netstandard2.0) (>= xamarinwatchos)) (&& (< net8.0) (>= xamarinios)) (&& (< net8.0) (>= xamarinmac)) (&& (< netstandard1.1) (>= netstandard2.0) (>= win8))
System.Configuration.ConfigurationManager (8.0.1)
System.Diagnostics.EventLog (>= 8.0.1) - restriction: >= net7.0
System.Security.Cryptography.ProtectedData (>= 8.0) - restriction: || (&& (< net462) (>= netstandard2.0)) (>= net6.0)
System.Diagnostics.EventLog (9.0.4) - restriction: >= net7.0
System.Security.Principal.Windows (>= 5.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
System.Memory (4.5.5) - restriction: || (&& (< net462) (< net8.0) (>= netstandard2.0)) (&& (>= net6.0) (< net8.0))
System.Buffers (>= 4.5.1) - restriction: || (&& (>= monoandroid) (< netstandard1.1)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (>= net461) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (< uap10.1) (>= wpa81)) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos)
System.Numerics.Vectors (>= 4.4) - restriction: && (< net45) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (>= monoandroid) (< netstandard1.1)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (< monoandroid) (< netstandard1.1) (>= portable-net45+win8+wpa81) (< win8)) (>= monotouch) (&& (>= net45) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (>= net461) (&& (< netstandard1.1) (>= win8)) (&& (< netstandard2.0) (>= wpa81)) (>= uap10.1) (>= xamarinios) (>= xamarinmac) (>= xamarintvos) (>= xamarinwatchos)
System.Numerics.Vectors (4.5) - restriction: || (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= net6.0) (< netcoreapp2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (>= monoandroid) (>= net6.0) (< netstandard1.1)) (&& (>= monoandroid) (< netstandard1.1) (>= netstandard2.0)) (&& (< monoandroid) (>= net6.0) (< netcoreapp2.1)) (&& (< monoandroid) (>= net6.0) (< netstandard1.1)) (&& (< monoandroid) (>= net6.0) (< netstandard2.0)) (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard2.0) (< win8)) (&& (>= monotouch) (>= net6.0)) (&& (>= monotouch) (>= netstandard2.0)) (&& (>= net45) (>= net6.0) (< netstandard2.0)) (&& (< net45) (< netcoreapp2.0) (>= netstandard2.0)) (&& (>= net461) (< net462) (>= netstandard2.0)) (&& (>= net461) (>= net6.0)) (&& (>= net6.0) (< net8.0) (>= xamarintvos)) (&& (>= net6.0) (< net8.0) (>= xamarinwatchos)) (&& (>= net6.0) (< netcoreapp2.0)) (&& (>= net6.0) (< netstandard1.1) (>= win8)) (&& (>= net6.0) (< netstandard2.0) (>= wpa81)) (&& (>= net6.0) (>= uap10.1)) (&& (< net8.0) (>= netstandard2.0) (>= xamarintvos)) (&& (< net8.0) (>= netstandard2.0) (>= xamarinwatchos)) (&& (< net8.0) (>= xamarinios)) (&& (< net8.0) (>= xamarinmac)) (&& (< netstandard1.1) (>= netstandard2.0) (>= win8)) (&& (>= netstandard2.0) (>= uap10.1))
System.Security.Cryptography.ProtectedData (9.0.4) - restriction: || (&& (< net462) (>= netstandard2.0)) (>= net6.0)
System.Memory (>= 4.5.5) - restriction: && (< net462) (< net8.0) (>= netstandard2.0)
System.Security.Principal.Windows (5.0) - restriction: || (&& (>= net462) (>= net7.0)) (&& (>= net7.0) (< net8.0))
YamlDotNet (12.0.1)
GITHUB
remote: fsprojects/FSharp.TypeProviders.SDK
src/ProvidedTypes.fs (6ad1174db0794a348f4a1c0aa5a60ae3f1803810)
src/ProvidedTypes.fsi (6ad1174db0794a348f4a1c0aa5a60ae3f1803810)
tests/ProvidedTypesTesting.fs (6ad1174db0794a348f4a1c0aa5a60ae3f1803810)
src/ProvidedTypes.fs (23b588d06acb8e100402523abc1d4f3f06325b8a)
src/ProvidedTypes.fsi (23b588d06acb8e100402523abc1d4f3f06325b8a)
tests/ProvidedTypesTesting.fs (23b588d06acb8e100402523abc1d4f3f06325b8a)
GROUP Test
RESTRICTION: == net6.0
NUGET
remote: https://api.nuget.org/v3/index.json
Expecto (9.0.4)
FSharp.Core (>= 4.6)
Mono.Cecil (>= 0.11.3)
FSharp.Core (6.0.6) - redirects: force
Microsoft.Win32.SystemEvents (6.0.1) - redirects: force
Mono.Cecil (0.11.4)
System.Configuration.ConfigurationManager (6.0.1) - redirects: force
System.Security.Cryptography.ProtectedData (>= 6.0)
System.Security.Permissions (>= 6.0)
System.Drawing.Common (6.0) - redirects: force
Microsoft.Win32.SystemEvents (>= 6.0)
System.Resources.Extensions (6.0)
System.Security.AccessControl (6.0) - redirects: force
System.Security.Cryptography.ProtectedData (6.0) - redirects: force
System.Security.Permissions (6.0) - redirects: force
System.Security.AccessControl (>= 6.0)
System.Windows.Extensions (>= 6.0)
System.Windows.Extensions (6.0) - redirects: force
System.Drawing.Common (>= 6.0)
FSharp.Core (>= 4.6) - restriction: || (>= net461) (>= netstandard2.0)
Mono.Cecil (>= 0.11.3) - restriction: || (>= net461) (>= netstandard2.0)
FSharp.Core (9.0.202) - redirects: force
Microsoft.Bcl.HashCode (6.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
Mono.Cecil (0.11.4) - restriction: || (>= net461) (>= netstandard2.0)
System.Buffers (4.6.1) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
System.Collections.Immutable (9.0.4) - restriction: || (>= net462) (&& (>= net8.0) (< net9.0)) (&& (< net8.0) (>= netstandard2.0))
System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
System.Configuration.ConfigurationManager (8.0.1) - redirects: force
System.Diagnostics.EventLog (>= 8.0.1) - restriction: >= net7.0
System.Security.Cryptography.ProtectedData (>= 8.0) - restriction: || (&& (< net462) (>= netstandard2.0)) (>= net6.0)
System.Diagnostics.EventLog (9.0.4) - redirects: force, restriction: >= net7.0
System.Security.Principal.Windows (>= 5.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
System.Formats.Nrbf (9.0.4) - restriction: || (>= net462) (>= netstandard2.0)
Microsoft.Bcl.HashCode (>= 1.1.1) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
System.Reflection.Metadata (>= 9.0.4) - restriction: || (>= net462) (&& (>= net8.0) (< net9.0)) (&& (< net8.0) (>= netstandard2.0))
System.ValueTuple (>= 4.5) - restriction: >= net462
System.Memory (4.6.3) - restriction: || (>= net462) (&& (>= net6.0) (< net8.0)) (&& (< net8.0) (>= netstandard2.0))
System.Buffers (>= 4.6.1) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
System.Numerics.Vectors (>= 4.6.1) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
System.Runtime.CompilerServices.Unsafe (>= 6.1.2) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
System.Numerics.Vectors (4.6.1) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
System.Reflection.Metadata (9.0.4) - restriction: || (>= net462) (&& (>= net8.0) (< net9.0)) (&& (< net8.0) (>= netstandard2.0))
System.Collections.Immutable (>= 9.0.4) - restriction: || (>= net462) (&& (>= net8.0) (< net9.0)) (&& (< net8.0) (>= netstandard2.0))
System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
System.Resources.Extensions (9.0.4)
System.Formats.Nrbf (>= 9.0.4) - restriction: || (>= net462) (>= netstandard2.0)
System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
System.Runtime.CompilerServices.Unsafe (6.1.2) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0)) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
System.Security.Cryptography.ProtectedData (9.0.4) - redirects: force, restriction: || (&& (< net462) (>= netstandard2.0)) (>= net6.0)
System.Memory (>= 4.5.5) - restriction: && (< net462) (< net8.0) (>= netstandard2.0)
System.Security.Principal.Windows (5.0) - redirects: force, restriction: || (&& (>= net462) (>= net7.0)) (&& (>= net7.0) (< net8.0))
System.ValueTuple (4.6.1) - restriction: >= net462
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<DefineConstants>DESIGNTIME</DefineConstants>
<OutputPath>..\FSharp.Configuration.Runtime\bin\$(Configuration)\typeproviders\fsharp41\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
namespace FSharp.Configuration.Yaml

// Put the TypeProviderAssemblyAttribute in the runtime DLL, pointing to the design-time DLL
#if TP_RUNTIME
[<assembly: CompilerServices.TypeProviderAssembly("FSharp.Configuration.DesignTime.dll")>]
do ()
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<DefineConstants>TP_RUNTIME</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
Expand All @@ -32,12 +33,11 @@
</ItemGroup>
<ItemGroup>
<!-- Be explicit about the version of FSharp.Core since we mention it in the manual nuget package spec -->
<PackageReference Include="FSharp.Core" Version="4.7.2" />
<PackageReference Include="FSharp.Core" Version="8.0.301" />
</ItemGroup>
<Target Name="BeforeBuild">
<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=net6.0" />
<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=$(TargetFramework)" />
</Target>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
Loading
Loading