Skip to content

Commit fbcb896

Browse files
adrianhalladrianhall
committed
(#413) WIP: OpenApi support
1 parent 0511bb1 commit fbcb896

File tree

10 files changed

+249
-164
lines changed

10 files changed

+249
-164
lines changed

‎.github/workflows/build-library.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ on:
2727
workflow_dispatch:
2828

2929
env:
30-
DOTNET_VERSION: '9.0.x'
30+
DOTNET_VERSION: '10.0.x'
3131
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
3232
DOTNET_NOLOGO: true
3333
DOTNET_CONFIGURATION: 'Release'
3434
NuGetDirectory: ${{ github.workspace }}/nuget
3535
SolutionFile: 'Datasync.Toolkit.sln'
36-
BASE_VERSION: '9.0.0'
36+
BASE_VERSION: '10.0.0'
3737

3838
permissions:
3939
pull-requests: write

‎.github/workflows/build-template.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ on:
1212
workflow_dispatch:
1313

1414
env:
15-
DOTNET_VERSION: '9.0.x'
15+
DOTNET_VERSION: '10.0.x'
1616
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
1717
DOTNET_NOLOGO: true
1818
DOTNET_CONFIGURATION: 'Release'
1919
NuGetDirectory: ${{ github.workspace }}/nuget
2020
SolutionFile: 'Datasync Solution.sln'
21-
BASE_VERSION: '9.0.0'
21+
BASE_VERSION: '10.0.0'
2222

2323
permissions:
2424
pull-requests: write

‎Directory.Packages.props‎

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,58 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
6+
<PropertyGroup>
7+
<DotNetVersion>10.0.0</DotNetVersion>
8+
<EFCoreVersion>10.0.0</EFCoreVersion>
9+
<TestContainersVersion>4.9.0</TestContainersVersion>
10+
<ODataVersion>9.0.0-preview.3</ODataVersion>
11+
</PropertyGroup>
612
<ItemGroup>
713
<PackageVersion Include="AutoMapper" Version="13.0.1" />
8-
<PackageVersion Include="AwesomeAssertions" Version="8.2.0" />
9-
<PackageVersion Include="Azure.Identity" Version="1.13.1" />
10-
<PackageVersion Include="FluentAssertions.Web" Version="1.8.0" />
14+
<PackageVersion Include="AwesomeAssertions" Version="9.3.0" />
15+
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
16+
<PackageVersion Include="FluentAssertions.Web" Version="1.9.5" />
1117
<PackageVersion Include="LiteDB" Version="5.0.21" />
12-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
13-
<PackageVersion Include="Microsoft.AspNetCore.OData" Version="9.3.1" />
14-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
15-
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.51.0" />
16-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
17-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Cosmos" Version="9.0.4" />
18-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.4" />
19-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.4" />
20-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
21-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.4" />
22-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
23-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
24-
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.4" />
25-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
26-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
27-
<PackageVersion Include="Microsoft.OData.Core" Version="8.2.3" />
18+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(DotNetVersion)" />
19+
<PackageVersion Include="Microsoft.AspNetCore.OData" Version="10.0.0-preview.1" />
20+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(DotNetVersion)" />
21+
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.56.0" />
22+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
23+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Cosmos" Version="$(EFCoreVersion)" />
24+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
25+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />
26+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
27+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EFCoreVersion)" />
28+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(EFCoreVersion)" />
29+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(EFCoreVersion)" />
30+
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(DotNetVersion)" />
31+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetVersion)" />
32+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
33+
<PackageVersion Include="Microsoft.OData.Core" Version="$(ODataVersion)" />
2834
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
29-
<PackageVersion Include="Microsoft.Spatial" Version="8.2.3" />
30-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
31-
<PackageVersion Include="MongoDB.Driver" Version="3.3.0" />
35+
<PackageVersion Include="Microsoft.Spatial" Version="$(ODataVersion)" />
36+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
37+
<PackageVersion Include="MongoDB.Driver" Version="3.5.2" />
3238
<PackageVersion Include="NSubstitute" Version="5.3.0" />
33-
<PackageVersion Include="NSwag.AspNetCore" Version="14.3.0" />
34-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
35-
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" />
36-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.1" />
37-
<PackageVersion Include="System.Formats.Asn1" Version="9.0.4" />
38-
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
39+
<PackageVersion Include="NSwag.AspNetCore" Version="14.6.3" />
40+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
41+
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
42+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.0.1" />
43+
<PackageVersion Include="System.Formats.Asn1" Version="$(DotNetVersion)" />
44+
<PackageVersion Include="System.Linq.Async" Version="7.0.0" />
3945
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
40-
<PackageVersion Include="System.Text.Json" Version="9.0.4" />
41-
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
42-
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.4" />
43-
<PackageVersion Include="TestContainers.MongoDb" Version="4.4.0" />
44-
<PackageVersion Include="TestContainers.MsSql" Version="4.4.0" />
45-
<PackageVersion Include="TestContainers.MySql" Version="4.4.0" />
46-
<PackageVersion Include="TestContainers.PostgreSql" Version="4.4.0" />
46+
<PackageVersion Include="System.Text.Json" Version="$(DotNetVersion)" />
47+
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="$(DotNetVersion)" />
48+
<PackageVersion Include="TestContainers.MongoDb" Version="$(TestContainersVersion)" />
49+
<PackageVersion Include="TestContainers.MsSql" Version="$(TestContainersVersion)" />
50+
<PackageVersion Include="TestContainers.MySql" Version="$(TestContainersVersion)" />
51+
<PackageVersion Include="TestContainers.PostgreSql" Version="$(TestContainersVersion)" />
4752
<PackageVersion Include="xRetry" Version="1.9.0" />
4853
<PackageVersion Include="xunit" Version="2.9.3" />
49-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
54+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
5055
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
5156
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
52-
<PackageVersion Include="Ulid" Version="1.3.4" />
57+
<PackageVersion Include="Ulid" Version="1.4.1" />
5358
<!-- Do not change XUnit.Combinatorial to v2 (xUnit v2 compatibility) -->
5459
<PackageVersion Include="XUnit.Combinatorial" Version="1.6.24" />
5560
<PackageVersion Include="XUnit.SkippableFact" Version="1.5.23" />

‎samples/datasync-server/src/Sample.Datasync.Server/Sample.Datasync.Server.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<UserSecretsId>2fc55b72-4090-46ad-ae44-8b6a415339b8</UserSecretsId>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.7" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.7">
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

0 commit comments

Comments
 (0)