Skip to content

Merge development into master #163

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.

Sign up for GitHub

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

Merged
NorthernLight1 merged 7 commits into from
Feb 5, 2026
Merged

Merge development into master #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0a26871
Update release.yml
NorthernLight1 Feb 4, 2026
a09d9cb
Update release.yml
NorthernLight1 Feb 4, 2026
e111603
Update release.yml
NorthernLight1 Feb 4, 2026
0bf5853
Update release.yml
NorthernLight1 Feb 4, 2026
60d2d00
Update dotnet.yml
NorthernLight1 Feb 5, 2026
3a82a48
Update N.EntityFramework.Extensions.Test.csproj
NorthernLight1 Feb 5, 2026
3736d2c
Update DbContextExtensionsBase.cs
NorthernLight1 Feb 5, 2026
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
6 changes: 3 additions & 3 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6
- name: Setup .NET
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v5
with:
dotnet-version: 6.0.x
dotnet-version: 10.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

- name: Publish to NuGet
if: ${{ inputs.nuget_publish }}
run: dotnet nuget push out/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source ${{ env.NUGET_SOURCE }} --skip-duplicate
run: dotnet nuget push .\out\*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source ${{ env.NUGET_SOURCE }} --skip-duplicate
env:
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}

Expand Down
2 changes: 1 addition & 1 deletion N.EntityFramework.Extensions.Test/DbContextExtensions/DbContextExtensionsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class DbContextExtensionsBase
public void Init()
{
var dbContext = new TestDbContext();
dbContext.Database.CreateIfNotExists();
//dbContext.Database.CreateIfNotExists();
}
protected static TestDbContext SetupDbContext(bool populateData, PopulateDataMode mode = PopulateDataMode.Normal)
{
Expand Down
8 changes: 4 additions & 4 deletions N.EntityFramework.Extensions.Test/N.EntityFramework.Extensions.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="MSTest.TestAdapter" Version="4.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\N.EntityFramework.Extensions\N.EntityFramework.Extensions.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
<PackageReference Include="MSTest.TestFramework" Version="4.1.0" />
</ItemGroup>
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
</Project>