Skip to content

Commit 2abe106

Browse files
ThoriumThorium
authored
Added .NET 8 runtime, updated Microsoft.OpenApi (#265)
1 parent 55aaf08 commit 2abe106

File tree

5 files changed

+49
-40
lines changed

5 files changed

+49
-40
lines changed

‎paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version 8.0.3
22
source https://api.nuget.org/v3/index.json
3-
frameworks: net8.0, netstandard2.0
3+
storage: none
44

55
nuget FSharp.Core ~> 6 // We need task{} CE from F# 6.0
66
nuget System.Text.Json ~> 6

‎paket.lock‎

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,54 @@
1-
RESTRICTION: || (== net8.0) (== netstandard2.0)
1+
STORAGE: NONE
22
NUGET
33
remote: https://api.nuget.org/v3/index.json
44
FSharp.Core (6.0.7)
55
FSharp.SystemTextJson (1.3.13)
6-
FSharp.Core (>= 4.7)
7-
System.Text.Json (>= 6.0)
8-
Microsoft.Bcl.AsyncInterfaces (9.0.1) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
9-
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netstandard2.1)) (== netstandard2.0)
10-
Microsoft.OpenApi (1.6.23)
11-
Microsoft.OpenApi.Readers (1.6.23)
12-
Microsoft.OpenApi (>= 1.6.23)
13-
SharpYaml (>= 2.1.1)
6+
FSharp.Core (>= 4.7) - restriction: >= netstandard2.0
7+
System.Text.Json (>= 6.0) - restriction: >= netstandard2.0
8+
Microsoft.Bcl.AsyncInterfaces (9.0.1) - restriction: || (>= net461) (&& (< netcoreapp3.1) (>= netstandard2.0))
9+
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (>= net462) (&& (>= netstandard2.0) (< netstandard2.1))
10+
Microsoft.NETCore.Platforms (7.0.4) - restriction: >= net461
11+
Microsoft.OpenApi (1.6.24) - restriction: >= netstandard2.0
12+
Microsoft.OpenApi.Readers (1.6.24)
13+
Microsoft.OpenApi (>= 1.6.24) - restriction: >= netstandard2.0
14+
SharpYaml (>= 2.1.1) - restriction: >= netstandard2.0
15+
NETStandard.Library (2.0.3) - restriction: >= net461
16+
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)
1417
NETStandard.Library.NETFramework (2.0.0-preview2-25405-01)
15-
SharpYaml (2.1.1)
16-
System.Buffers (4.6) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
17-
System.Memory (4.6) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
18-
System.Buffers (>= 4.6) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (== netstandard2.0)
19-
System.Numerics.Vectors (>= 4.6) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (== netstandard2.0)
20-
System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (== netstandard2.0)
21-
System.Numerics.Vectors (4.6) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
22-
System.Runtime.CompilerServices.Unsafe (6.1) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
23-
System.Text.Encodings.Web (9.0.1) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
24-
System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net462)) (== netstandard2.0)
25-
System.Memory (>= 4.5.5) - restriction: || (&& (== net8.0) (>= net462)) (== netstandard2.0)
26-
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net462)) (== netstandard2.0)
18+
Microsoft.NETCore.Platforms (>= 2.0.0-preview2-25405-01) - restriction: >= net461
19+
NETStandard.Library (>= 2.0.0-preview2-25401-01) - restriction: >= net461
20+
SharpYaml (2.1.1) - restriction: >= netstandard2.0
21+
System.Buffers (4.6) - restriction: || (>= net461) (&& (< net6.0) (>= netcoreapp3.1)) (&& (< netcoreapp2.1) (>= netstandard2.0)) (&& (< netcoreapp3.1) (>= netstandard2.0))
22+
System.Memory (4.6) - restriction: || (>= net461) (&& (< net6.0) (>= netcoreapp3.1)) (&& (< netcoreapp3.1) (>= netstandard2.0))
23+
System.Buffers (>= 4.6) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0))
24+
System.Numerics.Vectors (>= 4.6) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0))
25+
System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0))
26+
System.Numerics.Vectors (4.6) - restriction: || (>= net461) (&& (< netcoreapp2.1) (>= netstandard2.0)) (&& (< netcoreapp3.1) (>= netstandard2.0))
27+
System.Runtime.CompilerServices.Unsafe (6.1) - restriction: || (>= net461) (&& (< net6.0) (>= netcoreapp3.1)) (&& (< netcoreapp2.1) (>= netstandard2.0)) (&& (< netcoreapp3.1) (>= netstandard2.0))
28+
System.Text.Encodings.Web (9.0.1) - restriction: || (>= net461) (&& (< net6.0) (>= netcoreapp3.1)) (&& (< netcoreapp3.1) (>= netstandard2.0))
29+
System.Buffers (>= 4.5.1) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
30+
System.Memory (>= 4.5.5) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
31+
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net462) (&& (< net8.0) (>= netstandard2.0))
2732
System.Text.Json (6.0.11)
28-
Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
29-
System.Buffers (>= 4.5.1) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
30-
System.Memory (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
31-
System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
32-
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
33-
System.Text.Encodings.Web (>= 6.0.1) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
34-
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
35-
System.Threading.Tasks.Extensions (4.6) - restriction: || (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp3.1)) (== netstandard2.0)
36-
System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (== netstandard2.0)
33+
Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (>= net461) (&& (< netcoreapp3.1) (>= netstandard2.0))
34+
System.Buffers (>= 4.5.1) - restriction: || (>= net461) (&& (< netcoreapp3.1) (>= netstandard2.0))
35+
System.Memory (>= 4.5.4) - restriction: || (>= net461) (&& (< netcoreapp3.1) (>= netstandard2.0))
36+
System.Numerics.Vectors (>= 4.5) - restriction: || (>= net461) (&& (< netcoreapp3.1) (>= netstandard2.0))
37+
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (>= net461) (&& (< net6.0) (>= netcoreapp3.1)) (&& (< netcoreapp3.1) (>= netstandard2.0))
38+
System.Text.Encodings.Web (>= 6.0.1) - restriction: || (>= net461) (&& (< net6.0) (>= netcoreapp3.1)) (&& (< netcoreapp3.1) (>= netstandard2.0))
39+
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (>= net461) (&& (< netcoreapp3.1) (>= netstandard2.0))
40+
System.ValueTuple (>= 4.5) - restriction: >= net461
41+
System.Threading.Tasks.Extensions (4.6) - restriction: || (>= net461) (&& (< netcoreapp3.1) (>= netstandard2.0)) (&& (>= netstandard2.0) (< netstandard2.1))
42+
System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (>= net462) (&& (< netcoreapp2.1) (>= netstandard2.0))
43+
System.ValueTuple (4.6.1) - restriction: >= net461
3744
YamlDotNet (16.3)
3845
GITHUB
3946
remote: fsprojects/FSharp.TypeProviders.SDK
4047
src/ProvidedTypes.fs (23b588d06acb8e100402523abc1d4f3f06325b8a)
4148
src/ProvidedTypes.fsi (23b588d06acb8e100402523abc1d4f3f06325b8a)
4249
remote: fsprojects/FSharp.Data
43-
src/FSharp.Data.Runtime.Utilities/NameUtils.fs (a7de354df7007bd74faa7d139fabab6cc55e2f0c)
44-
src/FSharp.Data.Runtime.Utilities/Pluralizer.fs (a7de354df7007bd74faa7d139fabab6cc55e2f0c)
50+
src/FSharp.Data.Runtime.Utilities/NameUtils.fs (db461d259bbaba330ca0c9255e9b957043a34b84)
51+
src/FSharp.Data.Runtime.Utilities/Pluralizer.fs (db461d259bbaba330ca0c9255e9b957043a34b84)
4552
GROUP Server
4653
RESTRICTION: == net9.0
4754
NUGET
@@ -445,7 +452,7 @@ NUGET
445452
Microsoft.Extensions.Options (>= 9.0.1)
446453
Microsoft.Net.Http.Headers (9.0.1)
447454
Microsoft.Extensions.Primitives (>= 9.0.1)
448-
Microsoft.OpenApi (1.6.23)
455+
Microsoft.OpenApi (1.6.24)
449456
Newtonsoft.Json (13.0.3)
450457
Newtonsoft.Json.Bson (1.0.3)
451458
Newtonsoft.Json (>= 13.0.1)
@@ -505,9 +512,9 @@ NUGET
505512
Microsoft.NET.Test.Sdk (17.12)
506513
Microsoft.CodeCoverage (>= 17.12)
507514
Microsoft.TestPlatform.TestHost (>= 17.12)
508-
Microsoft.OpenApi (1.6.23) - redirects: force
509-
Microsoft.OpenApi.Readers (1.6.23) - redirects: force
510-
Microsoft.OpenApi (>= 1.6.23)
515+
Microsoft.OpenApi (1.6.24) - redirects: force
516+
Microsoft.OpenApi.Readers (1.6.24) - redirects: force
517+
Microsoft.OpenApi (>= 1.6.24)
511518
SharpYaml (>= 2.1.1)
512519
Microsoft.Testing.Extensions.TrxReport.Abstractions (1.5.1)
513520
Microsoft.Testing.Platform (>= 1.5.1)

‎src/SwaggerProvider.DesignTime/SwaggerProvider.DesignTime.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<OutputPath>..\SwaggerProvider.Runtime\bin\$(Configuration)\typeproviders\fsharp41\</OutputPath>
1212
<!-- This allows the component to execute from 'bin' directory during build -->
1313
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
14+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1415
</PropertyGroup>
1516
<ItemGroup>
1617
<Compile Include="..\..\paket-files\fsprojects\FSharp.Data\src\FSharp.Data.Runtime.Utilities\Pluralizer.fs">

‎src/SwaggerProvider.Runtime/SwaggerProvider.Runtime.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
55
<PropertyGroup>
66
<OutputType>Library</OutputType>
7-
<TargetFramework>netstandard2.0</TargetFramework>
7+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
88
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
99
<DefineConstants>TP_RUNTIME</DefineConstants>
10+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1011
</PropertyGroup>
1112
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
1213
<ItemGroup>
@@ -29,8 +30,7 @@
2930
</ItemGroup>
3031
<Target Name="BeforeBuild">
3132
<MSBuild Projects="..\SwaggerProvider.DesignTime\SwaggerProvider.DesignTime.fsproj" Targets="Restore" />
32-
<MSBuild Projects="..\SwaggerProvider.DesignTime\SwaggerProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net8.0" />
33-
<MSBuild Projects="..\SwaggerProvider.DesignTime\SwaggerProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0" />
33+
<MSBuild Projects="..\SwaggerProvider.DesignTime\SwaggerProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=$(TargetFramework)" />
3434
</Target>
3535
<Target Name="AfterBuild">
3636
</Target>

‎src/SwaggerProvider.Runtime/paket.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ description
2424
F# Type Providers for Swagger & OpenAPI
2525
files
2626
bin/Release/netstandard2.0/SwaggerProvider.Runtime.* ==> lib/netstandard2.0
27+
bin/Release/net8.0/SwaggerProvider.Runtime.* ==> lib/net8.0
2728
bin/Release/typeproviders/fsharp41/netstandard2.0/*.dll ==> typeproviders/fsharp41/netstandard2.0
2829
bin/Release/typeproviders/fsharp41/net8.0/*.dll ==> typeproviders/fsharp41/net8.0
2930
references

0 commit comments

Comments
 (0)