Skip to content
Merged
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
20 changes: 10 additions & 10 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
with:
fetch-depth: 0
- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
8.0.x
9.0.x
- name: Restore
run: dotnet restore
- name: Build
Expand All @@ -47,12 +47,12 @@ jobs:
#
- name: Upload artifacts
if: matrix.os == 'ubuntu-latest'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts
path: ./artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-results-${{ matrix.os }}
path: ./test-results
Expand All @@ -66,13 +66,13 @@ jobs:
name: Deploy Testing
steps:
- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
8.0.x
9.0.x
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: artifacts
path: ./artifacts
Expand All @@ -89,13 +89,13 @@ jobs:
name: Deploy Production
steps:
- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
8.0.x
9.0.x
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: artifacts
path: ./artifacts
Expand Down
3 changes: 3 additions & 0 deletions AppCoreNet.Data.sln
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
LICENSE = LICENSE
README.md = README.md
stylecop.json = stylecop.json
Directory.Packages.props = Directory.Packages.props
NuGet.config = NuGet.config
renovate.json = renovate.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{80A494A8-C591-4A8D-98DF-826D2D32ECA9}"
Expand Down
15 changes: 6 additions & 9 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<!-- GitVersion -->
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
<PackageReference Include="GitVersion.MsBuild">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -38,7 +38,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PackageReference Include="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -47,6 +47,7 @@
<!-- Code Analysis -->
<PropertyGroup>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)AppCoreNet.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

Expand All @@ -55,19 +56,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PackageReference Include="StyleCop.Analyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PackageReference Include="IDisposableAnalyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="IDisposableAnalyzers" Version="4.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
33 changes: 33 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" />
<PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
<PackageVersion Include="GitVersion.MsBuild" Version="6.3.0" />

<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
<PackageVersion Include="FluentAssertions" Version="8.2.0" />
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />

<PackageVersion Include="AppCoreNet.Diagnostics.Sources" Version="0.6.1" />
<PackageVersion Include="AppCoreNet.TypeHelpers.Sources" Version="0.6.1" />
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />

<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />

<PackageVersion Include="AppCoreNet.Extensions.DependencyInjection.Abstractions" Version="0.6.3" />
</ItemGroup>
</Project>
11 changes: 6 additions & 5 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
workflow: GitFlow/v1
mode: ContinuousDelivery
assembly-versioning-scheme: Major
assembly-file-versioning-scheme: MajorMinorPatchTag
assembly-informational-format: '{SemVer}+{ShortSha}'
continuous-delivery-fallback-tag: 'alpha'
mode: 'ContinuousDeployment'
branches:
main:
label: alpha
increment: Minor
support:
label: alpha
pull-request:
tag: 'pr'
ignore:
sha: []
label: pr
16 changes: 16 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<auditSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</auditSources>
<packageSourceMapping>
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.0",
"version": "9.0.300",
"rollForward": "latestFeature",
"allowPrerelease": false
}
Expand Down
20 changes: 20 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"packageRules": [
{
"groupName": "AppCoreNet.Shared",
"matchSourceUrls": [
"https://github.com/AppCoreNet/Shared"
]
},
{
"groupName": "AppCoreNet.Extensions",
"matchSourceUrls": [
"https://github.com/AppCoreNet/Extensions"
]
}
]
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;net462</TargetFrameworks>
<TargetFrameworks>net8.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
<RootNamespace>AppCoreNet.Data</RootNamespace>
<Description>Provides public API for the AppCore .NET persistence framework.</Description>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net462' OR '$(TargetFramework)'=='netstandard2.0'">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/AppCoreNet.Data.Abstractions/EntityExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static class EntityExtensions
/// </summary>
/// <typeparam name="TId">The type of the entity id.</typeparam>
/// <param name="entity">The entity.</param>
/// <returns><c>tru</c> if the entity is transient; <c>false</c> otherwise.</returns>
/// <returns><c>true</c> if the entity is transient; <c>false</c> otherwise.</returns>
Copy link

Copilot AI May 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The XML documentation was updated to correct a spelling typo from 'tru' to 'true'. This improves clarity for consumers of the API.

Copilot uses AI. Check for mistakes.
public static bool IsTransient<TId>(this IEntity<TId> entity)
{
Ensure.Arg.NotNull(entity);
Expand Down
14 changes: 3 additions & 11 deletions src/AppCoreNet.Data.AutoMapper/AppCoreNet.Data.AutoMapper.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<Description>Adds AutoMapper support to AppCore .NET persistence.</Description>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='net462'">
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="[8.1.1,9.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="[12.0.1,13.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="AutoMapper" Version="[13.0.1,14.0.0)" />
<ItemGroup>
<PackageReference Include="AutoMapper" VersionOverride="14.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ public static class AutoMapperDataProviderBuilderExtensions
/// </summary>
/// <param name="builder">The <see cref="IDataProviderBuilder"/>.</param>
/// <param name="config">The delegate used to configure AutoMapper.</param>
public static void AddAutoMapper(this IDataProviderBuilder builder, Action<IMapperConfigurationExpression>? config = null)
public static void AddAutoMapper(
this IDataProviderBuilder builder,
Action<IMapperConfigurationExpression>? config = null)
{
Ensure.Arg.NotNull(builder);

builder.Services.AddAutoMapper(config);
builder.Services.TryAddTransient<IEntityMapper, AutoMapperEntityMapper>();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netstandard2.0;net462</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<Description>Adds EntityFramework Core support to AppCore .NET persistence.</Description>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net462' OR '$(TargetFramework)'=='netstandard2.0'">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.32,4.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.26,9.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.1,9.0.0)" />
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="8.0.16" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading