Skip to content

Commit f36799e

Browse files
authored
Updates for v6 release (#51)
* updates for v6 release * update documentation * bump year * more fixes * submodules * submodules * cleanup * cli help update * api updates * use .net 10 sdk * use net10 sdk * use net10 * workaround docfx issues
1 parent e9f5690 commit f36799e

File tree

23 files changed

+618
-398
lines changed

23 files changed

+618
-398
lines changed

.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
root = true
22

33
[*]
4+
indent_style = tab
5+
indent_size = 4
46
insert_final_newline = true
57
end_of_line = crlf

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
path = submodules/linq2db
33
url = https://github.com/linq2db/linq2db.git
44
branch = release
5-
[submodule "submodules/linq2db.EntityFrameworkCore"]
6-
path = submodules/linq2db.EntityFrameworkCore
7-
url = https://github.com/linq2db/linq2db.EntityFrameworkCore.git
8-
branch = release
95
[submodule "submodules/LinqToDB.Identity"]
106
path = submodules/LinqToDB.Identity
117
url = https://github.com/linq2db/LinqToDB.Identity.git

Directory.Build.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<ArtifactsPath>$(MSBuildThisFileDirectory)submodules\linq2db\.build</ArtifactsPath>
4+
<ArtifactsPivots>$(Configuration)\$(TargetFramework)</ArtifactsPivots>
5+
</PropertyGroup>
6+
<ItemGroup Label="Ignore Useless NugetAudit Errors">
7+
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-hxrm-9w7p-39cc" />
8+
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-vh55-786g-wjwj" />
9+
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-ghhp-997w-qr28" />
10+
</ItemGroup>
11+
</Project>

azure-pipelines.build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ steps:
1313
persistCredentials: true
1414
submodules: true
1515

16+
- task: UseDotNet@2
17+
displayName: 'Use latest .NET SDK'
18+
inputs:
19+
packageType: sdk
20+
version: 10.x
21+
1622
# build documentation
1723
- task: PowerShell@2
1824
inputs:

azure-pipelines.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ steps:
1414
persistCredentials: true
1515
submodules: true
1616

17+
- task: UseDotNet@2
18+
displayName: 'Use latest .NET SDK'
19+
inputs:
20+
packageType: sdk
21+
version: 10.x
22+
1723
# build and deploy documentation
1824
- task: PowerShell@2
1925
inputs:

build.ps1

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@ Write-Host Prepare tooling...
1313
dotnet tool install docfx -g
1414

1515
Write-Host Restore...
16-
dotnet restore 'submodules/linq2db/Source/LinqToDB/LinqToDB.csproj'
17-
dotnet restore 'submodules/linq2db/Source/LinqToDB.AspNet/LinqToDB.AspNet.csproj'
18-
dotnet restore 'submodules/linq2db/Source/LinqToDB.Remote.Grpc/LinqToDB.Remote.Grpc.csproj'
19-
dotnet restore 'submodules/linq2db/Source/LinqToDB.Remote.Wcf/LinqToDB.Remote.Wcf.csproj'
20-
dotnet restore 'submodules/linq2db/Source/LinqToDB.Tools/LinqToDB.Tools.csproj'
21-
dotnet restore 'submodules/linq2db.EntityFrameworkCore/Source/LinqToDB.EntityFrameworkCore/linq2db.EntityFrameworkCore.csproj'
22-
dotnet restore 'submodules/LinqToDB.Identity/src/LinqToDB.Identity/LinqToDB.Identity.csproj'
16+
# workaround for https://github.com/dotnet/docfx/pull/8375
17+
# also works as workaround for https://github.com/dotnet/docfx/issues/9775
18+
dotnet build -c Release 'submodules/linq2db/Source/LinqToDB.FSharp/LinqToDB.FSharp.fsproj'
2319

2420
Write-Host Build DocFX documentation...
2521
docfx source/docfx.json
22+
2623
if ($LASTEXITCODE -ne 0)
2724
{
2825
throw "DocFx build failed";

global.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "10.0.0",
4+
"rollForward": "minor",
5+
"allowPrerelease": false
6+
}
7+
}

source/articles/CLI.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ uid: cli
2727
## Installation
2828

2929
> [!NOTE]
30-
> Requres .NET Core 3.1 or higher.
30+
> Requres .NET 6 or higher.
3131
3232
Install as global tool:
3333

@@ -628,6 +628,7 @@ public sealed class PropertyModel
628628
public Modifiers Modifiers { get; set; }
629629
public bool IsDefault { get; set; }
630630
public bool HasSetter { get; set; }
631+
public Modifiers SetterModifiers { get; set; }
631632
public string? TrailingComment { get; set; }
632633
public List<CodeAttribute>? CustomAttributes { get; set; }
633634
}

0 commit comments

Comments
 (0)