Skip to content

Updates for v6 release #51

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.

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
root = true

[*]
indent_style = tab
indent_size = 4
insert_final_newline = true
end_of_line = crlf
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
path = submodules/linq2db
url = https://github.com/linq2db/linq2db.git
branch = release
[submodule "submodules/linq2db.EntityFrameworkCore"]
path = submodules/linq2db.EntityFrameworkCore
url = https://github.com/linq2db/linq2db.EntityFrameworkCore.git
branch = release
[submodule "submodules/LinqToDB.Identity"]
path = submodules/LinqToDB.Identity
url = https://github.com/linq2db/LinqToDB.Identity.git
Expand Down
11 changes: 11 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ArtifactsPath>$(MSBuildThisFileDirectory)submodules\linq2db\.build</ArtifactsPath>
<ArtifactsPivots>$(Configuration)\$(TargetFramework)</ArtifactsPivots>
</PropertyGroup>
<ItemGroup Label="Ignore Useless NugetAudit Errors">
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-hxrm-9w7p-39cc" />
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-vh55-786g-wjwj" />
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-ghhp-997w-qr28" />
</ItemGroup>
</Project>
11 changes: 4 additions & 7 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,13 @@ Write-Host Prepare tooling...
dotnet tool install docfx -g

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

Write-Host Build DocFX documentation...
docfx source/docfx.json

if ($LASTEXITCODE -ne 0)
{
throw "DocFx build failed";
Expand Down
7 changes: 7 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"version": "9.0.0",
"rollForward": "minor",
"allowPrerelease": false
}
}
3 changes: 2 additions & 1 deletion source/articles/CLI.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ uid: cli
## Installation

> [!NOTE]
> Requres .NET Core 3.1 or higher.
> Requres .NET 6 or higher.

Install as global tool:

Expand Down Expand Up @@ -628,6 +628,7 @@ public sealed class PropertyModel
public Modifiers Modifiers { get; set; }
public bool IsDefault { get; set; }
public bool HasSetter { get; set; }
public Modifiers SetterModifiers { get; set; }
public string? TrailingComment { get; set; }
public List<CodeAttribute>? CustomAttributes { get; set; }
}
Expand Down
Loading