Skip to content

Commit a929424

Browse files
hazzikhazzik
committed
Merge branch 'main' into gh-96 
2 parents 46fd818 + f25188b commit a929424

26 files changed

+221
-130
lines changed

‎.github/copilot-instructions.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dotnet test -c Debug -f net8.0 src/DelegateDecompiler.EntityFramework.Tests
2727
dotnet test -c Debug -f net8.0 src/DelegateDecompiler.EntityFrameworkCore6.Tests
2828
dotnet test -c Debug -f net8.0 src/DelegateDecompiler.EntityFrameworkCore8.Tests
2929
dotnet test -c Debug -f net9.0 src/DelegateDecompiler.EntityFrameworkCore9.Tests
30+
dotnet test -c Debug -f net10.0 src\DelegateDecompiler.EntityFrameworkCore10.Tests
3031
```
3132

3233
Use `-p:DisableGitVersionTask=true` flag to avoid build issues if GitVersion is not set up.

‎.github/workflows/.NET-Framework.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main ]
87

98
jobs:
109
dotnet-framework:

‎.github/workflows/create-release-tag.yml‎ renamed to ‎.github/workflows/create-release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Create Release Tag
1+
name: Create Release
22

33
on:
44
workflow_dispatch:
@@ -21,7 +21,7 @@ jobs:
2121
id: gitversion
2222
uses: gittools/actions/gitversion/execute@v4
2323

24-
- name: Create and Push Tag
25-
run: |
26-
git tag ${{ steps.gitversion.outputs.majorMinorPatch }}
27-
git push origin ${{ steps.gitversion.outputs.majorMinorPatch }}
24+
- name: Create Release
25+
run: gh release create ${{ steps.gitversion.outputs.majorMinorPatch }} --generate-notes --target $GITHUB_SHA
26+
env:
27+
GH_TOKEN: ${{ secrets.GH_TOKEN }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main ]
87
workflow_dispatch:
98

109
jobs:
@@ -41,6 +40,7 @@ jobs:
4140

4241
- name: Restore
4342
run: dotnet restore
43+
4444
- name: Patch App.config
4545
run: |
4646
$configPath = 'src/DelegateDecompiler.EntityFramework.Tests/App.config'
@@ -57,6 +57,6 @@ jobs:
5757
dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.Tests
5858
dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.Tests.VB
5959
dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFramework.Tests
60-
dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFrameworkCore6.Tests
6160
dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFrameworkCore8.Tests
6261
dotnet test --no-build -c Release -f net9.0 src/DelegateDecompiler.EntityFrameworkCore9.Tests
62+
dotnet test --no-build -c Release -f net10.0 src\DelegateDecompiler.EntityFrameworkCore10.Tests

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main ]
87
workflow_dispatch:
98

109
jobs:
@@ -52,6 +51,6 @@ jobs:
5251
dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.Tests
5352
dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.Tests.VB
5453
dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFramework.Tests
55-
dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFrameworkCore6.Tests
5654
dotnet test --no-build -c Release -f net8.0 src/DelegateDecompiler.EntityFrameworkCore8.Tests
5755
dotnet test --no-build -c Release -f net9.0 src/DelegateDecompiler.EntityFrameworkCore9.Tests
56+
dotnet test --no-build -c Release -f net10.0 src\DelegateDecompiler.EntityFrameworkCore10.Tests

‎.github/workflows/publish-nuget.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
tags:
66
- '*'
77

8+
permissions:
9+
id-token: write
10+
contents: read
11+
812
jobs:
913
publish:
1014
runs-on: ubuntu-latest
@@ -29,7 +33,11 @@ jobs:
2933
- name: Pack
3034
run: dotnet pack --no-build --configuration Release --output ./Release
3135

32-
- name: Publish to NuGet
33-
run: dotnet nuget push ./Release/*.nupkg -s nuget.org -k ${NUGET_API_KEY}
34-
env:
35-
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
36+
- name: NuGet Login
37+
uses: NuGet/login@v1
38+
id: login
39+
with:
40+
user: hazzik
41+
42+
- name: NuGet Publish
43+
run: dotnet nuget push ./Release/*.nupkg -s nuget.org -k ${{ steps.login.outputs.NUGET_API_KEY }}

‎DelegateDecompiler.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DelegateDecompiler.EntityFr
2727
EndProject
2828
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "DelegateDecompiler.Tests.VB", "src\DelegateDecompiler.Tests.VB\DelegateDecompiler.Tests.VB.vbproj", "{19EC81F1-783D-4F53-BCB8-4F87BA3A28EC}"
2929
EndProject
30-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DelegateDecompiler.EntityFrameworkCore6.Tests", "src\DelegateDecompiler.EntityFrameworkCore6.Tests\DelegateDecompiler.EntityFrameworkCore6.Tests.csproj", "{0EC42D3F-C97B-4803-96BF-953B0139578C}"
31-
EndProject
3230
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DelegateDecompiler.EntityFrameworkCore5", "src\DelegateDecompiler.EntityFrameworkCore5\DelegateDecompiler.EntityFrameworkCore5.csproj", "{79DA2FBB-7A35-4AFF-A89B-CF8F5DADC1B2}"
3331
EndProject
3432
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DelegateDecompiler.EntityFrameworkCore8.Tests", "src\DelegateDecompiler.EntityFrameworkCore8.Tests\DelegateDecompiler.EntityFrameworkCore8.Tests.csproj", "{4B729DD4-7A37-4D16-B241-10DD5B12EDA0}"
3533
EndProject
3634
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DelegateDecompiler.EntityFrameworkCore9.Tests", "src\DelegateDecompiler.EntityFrameworkCore9.Tests\DelegateDecompiler.EntityFrameworkCore9.Tests.csproj", "{1E051041-B9CB-44AC-B2A2-5D4A4B91B2DB}"
3735
EndProject
36+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DelegateDecompiler.EntityFrameworkCore10.Tests", "src\DelegateDecompiler.EntityFrameworkCore10.Tests\DelegateDecompiler.EntityFrameworkCore10.Tests.csproj", "{5C3905CC-6B38-4C95-80FC-0DB5B72C5ABD}"
37+
EndProject
3838
Global
3939
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4040
Debug|Any CPU = Debug|Any CPU
@@ -61,10 +61,6 @@ Global
6161
{19EC81F1-783D-4F53-BCB8-4F87BA3A28EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
6262
{19EC81F1-783D-4F53-BCB8-4F87BA3A28EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
6363
{19EC81F1-783D-4F53-BCB8-4F87BA3A28EC}.Release|Any CPU.Build.0 = Release|Any CPU
64-
{0EC42D3F-C97B-4803-96BF-953B0139578C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65-
{0EC42D3F-C97B-4803-96BF-953B0139578C}.Debug|Any CPU.Build.0 = Debug|Any CPU
66-
{0EC42D3F-C97B-4803-96BF-953B0139578C}.Release|Any CPU.ActiveCfg = Release|Any CPU
67-
{0EC42D3F-C97B-4803-96BF-953B0139578C}.Release|Any CPU.Build.0 = Release|Any CPU
6864
{79DA2FBB-7A35-4AFF-A89B-CF8F5DADC1B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6965
{79DA2FBB-7A35-4AFF-A89B-CF8F5DADC1B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
7066
{79DA2FBB-7A35-4AFF-A89B-CF8F5DADC1B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -77,6 +73,10 @@ Global
7773
{1E051041-B9CB-44AC-B2A2-5D4A4B91B2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
7874
{1E051041-B9CB-44AC-B2A2-5D4A4B91B2DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
7975
{1E051041-B9CB-44AC-B2A2-5D4A4B91B2DB}.Release|Any CPU.Build.0 = Release|Any CPU
76+
{5C3905CC-6B38-4C95-80FC-0DB5B72C5ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
77+
{5C3905CC-6B38-4C95-80FC-0DB5B72C5ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU
78+
{5C3905CC-6B38-4C95-80FC-0DB5B72C5ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU
79+
{5C3905CC-6B38-4C95-80FC-0DB5B72C5ABD}.Release|Any CPU.Build.0 = Release|Any CPU
8080
EndGlobalSection
8181
GlobalSection(SolutionProperties) = preSolution
8282
HideSolutionNode = FALSE

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.100",
44
"rollForward": "latestFeature"
55
}
66
}

‎src/DelegateDecompiler.EntityFramework.Tests/DelegateDecompiler.EntityFramework.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageReference Include="NUnit" Version="3.13.3" />
1010
<PackageReference Include="NUnit.Analyzers" Version="4.2.0" PrivateAssets="all" />
1111
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.3" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎src/DelegateDecompiler.EntityFramework/DelegateDecompiler.EntityFramework.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="EntityFramework" Version="6.3.0" />
10+
<PackageReference Include="EntityFramework" Version="6.5.1" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

0 commit comments

Comments
 (0)