Skip to content

Commit fac7df1

Browse files
WeihanLiWeihanLi
authored
Merge pull request #70 from WeihanLi/dev
9.1.0 preview 1
2 parents 1fe6d30 + 4efc368 commit fac7df1

25 files changed

+459
-149
lines changed

‎.github/stale.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/workflows/default.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ jobs:
1212
- name: Setup .NET SDK
1313
uses: actions/setup-dotnet@v4
1414
with:
15-
dotnet-version: |
16-
8.0.x
15+
dotnet-version: 9.0.x
1716
- name: dotnet info
1817
run: dotnet --info
1918
- name: build

‎.github/workflows/dotnet-format.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ jobs:
1010
- name: Setup .NET SDK
1111
uses: actions/setup-dotnet@v4
1212
with:
13-
dotnet-version: |
14-
8.0.x
15-
include-prerelease: true
13+
dotnet-version: 9.0.x
1614
- name: build
1715
run: dotnet build
1816
- name: format

‎.github/workflows/release.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Release
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches: [ master ]
6+
jobs:
7+
build:
8+
name: Release
9+
runs-on: windows-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: Setup .NET SDK
13+
uses: actions/setup-dotnet@v4
14+
with:
15+
dotnet-version: 9.0.x
16+
- name: Build
17+
shell: pwsh
18+
run: .\build.ps1 --stable=true
19+
- name: Get Release Version
20+
shell: pwsh
21+
run: dotnet-exec https://github.com/OpenReservation/scripts/blob/main/build/export-gh-release-version.cs
22+
- name: create release
23+
shell: pwsh
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
run: |
27+
gh release create ${{ env.ReleaseVersion }} --generate-notes --target master (Get-Item ./artifacts/packages/*.nupkg)

‎Directory.Build.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
2-
<Import Project="./build/sign.props" />
32
<Import Project="./build/version.props" />
43

54
<PropertyGroup>
6-
<LangVersion>latest</LangVersion>
5+
<TargetFramework>net9.0</TargetFramework>
6+
<LangVersion>preview</LangVersion>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
9-
<CommonVersion>1.0.66</CommonVersion>
10-
<EFVersion>8.0.6</EFVersion>
9+
<CommonVersion>1.0.74</CommonVersion>
10+
<EFVersion>9.0.0</EFVersion>
1111

1212
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1313
<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -20,6 +20,6 @@
2020
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
2121
<RepositoryUrl>https://github.com/WeihanLi/WeihanLi.EntityFramework</RepositoryUrl>
2222
<RepositoryType>git</RepositoryType>
23-
<Copyright>Copyright 2019-2024 (c) WeihanLi</Copyright>
23+
<Copyright>Copyright 2019-$([System.DateTime]::Now.Year) (c) WeihanLi</Copyright>
2424
</PropertyGroup>
2525
</Project>

‎README.md‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,26 @@
1010

1111
## Intro
1212

13-
EntityFramework extensions
13+
[EntityFrameworkCore](https://github.com/dotnet/efcore) extensions
1414

1515
## Package Release Notes
1616

17-
See PRs for details
17+
See Releases/PRs for details
1818

19-
https://github.com/WeihanLi/WeihanLi.EntityFramework/pulls?q=is%3Apr+is%3Aclosed+is%3Amerged+base%3Amaster
19+
- Releases: https://github.com/WeihanLi/WeihanLi.EntityFramework/releases
20+
- PRs: https://github.com/WeihanLi/WeihanLi.EntityFramework/pulls?q=is%3Apr+is%3Aclosed+is%3Amerged+base%3Amaster
2021

2122
> Package Versions
2223
>
23-
> For EF Core 2.x , use 1.4.x and below
24+
> For EF 8 and above, use 8.x or above major-version matched versions
2425
>
25-
> For EF Core 3.x, use 1.5.0 above, and 2.0.0 below
26+
> For EF 7, use 3.x
2627
>
2728
> For EF Core 5/6, use 2.x
2829
>
29-
> For EF 7, use 3.0.0 and above
30+
> For EF Core 3.x, use 1.5.0 above, and 2.0.0 below
3031
>
31-
> For EF 8 and above, use 8.x or above major-version matched versions
32+
> For EF Core 2.x , use 1.4.x and below
3233
3334
## Features
3435

@@ -51,14 +52,14 @@ https://github.com/WeihanLi/WeihanLi.EntityFramework/pulls?q=is%3Apr+is%3Aclosed
5152

5253
- AutoUpdate
5354

54-
- Soft delete for specific entity
55+
- Soft delete for the specific entity
5556
- Auto update CreatedAt/UpdatedAt/CreatedBy/UpdatedBy
5657

5758
- Extensions
5859

5960
- Update specific column(s) `Update`
6061
- Update without specific column(s) `UpdateWithout`
6162

62-
## Contact
63+
## Support
6364

64-
contact me <weihanli@outlook.com> if you need
65+
Feel free to try and [create issues](https://github.com/WeihanLi/WeihanLi.EntityFramework/issues/new) if you have any questions or integration issues

‎WeihanLi.EntityFramework.sln‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WeihanLi.EntityFramework.Te
1515
EndProject
1616
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A1756F80-F25E-4ADC-A079-048FFCA5DBA6}"
1717
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeihanLi.EntityFramework.SourceGenerator", "src\WeihanLi.EntityFramework.SourceGenerator\WeihanLi.EntityFramework.SourceGenerator.csproj", "{010A98BE-1871-4E6F-8129-7A1C44C73423}"
19+
EndProject
1820
Global
1921
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2022
Debug|Any CPU = Debug|Any CPU
@@ -61,6 +63,18 @@ Global
6163
{9DF6D464-63A7-487C-9763-4A212ADDFC4B}.Release|x64.Build.0 = Release|Any CPU
6264
{9DF6D464-63A7-487C-9763-4A212ADDFC4B}.Release|x86.ActiveCfg = Release|Any CPU
6365
{9DF6D464-63A7-487C-9763-4A212ADDFC4B}.Release|x86.Build.0 = Release|Any CPU
66+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Debug|Any CPU.Build.0 = Debug|Any CPU
68+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Debug|x64.ActiveCfg = Debug|Any CPU
69+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Debug|x64.Build.0 = Debug|Any CPU
70+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Debug|x86.ActiveCfg = Debug|Any CPU
71+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Debug|x86.Build.0 = Debug|Any CPU
72+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Release|x64.ActiveCfg = Release|Any CPU
75+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Release|x64.Build.0 = Release|Any CPU
76+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Release|x86.ActiveCfg = Release|Any CPU
77+
{010A98BE-1871-4E6F-8129-7A1C44C73423}.Release|x86.Build.0 = Release|Any CPU
6478
EndGlobalSection
6579
GlobalSection(SolutionProperties) = preSolution
6680
HideSolutionNode = FALSE
@@ -69,6 +83,7 @@ Global
6983
{0BB1C3F3-50C6-4924-894C-0A9A7BA4E54A} = {40B7673F-5ACD-42E4-AE04-6C3AEEBC8546}
7084
{0E013C55-6D52-4B68-B188-460B97DB1E48} = {46AED92E-94FC-409A-9CFB-C9CD4E59717D}
7185
{9DF6D464-63A7-487C-9763-4A212ADDFC4B} = {A1756F80-F25E-4ADC-A079-048FFCA5DBA6}
86+
{010A98BE-1871-4E6F-8129-7A1C44C73423} = {40B7673F-5ACD-42E4-AE04-6C3AEEBC8546}
7287
EndGlobalSection
7388
GlobalSection(ExtensibilityGlobals) = postSolution
7489
SolutionGuid = {201A8B4F-A16D-44B7-BB29-F9B9CFC2A467}

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ steps:
1111
displayName: 'Use .NET sdk'
1212
inputs:
1313
packageType: sdk
14-
version: 8.0.x
14+
version: 9.0.x
1515
includePreviewVersions: true
1616

1717
- script: dotnet --info

‎build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[string]$SCRIPT = '.\build\build.cs'
22

33
# Install dotnet tool
4-
dotnet tool install --global dotnet-execute
4+
dotnet tool update --global dotnet-execute
55

66
Write-Host "dotnet-exec $SCRIPT --args $ARGS" -ForegroundColor GREEN
77

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SCRIPT='./build/build.cs'
33

44
# Install tool
5-
dotnet tool install --global dotnet-execute
5+
dotnet tool update --global dotnet-execute
66
export PATH="$PATH:$HOME/.dotnet/tools"
77

88
echo "dotnet-exec $SCRIPT --args=$@"

0 commit comments

Comments
 (0)