Skip to content

Commit 1f00746

Browse files
prochnowcprochnowc
authored
Merge pull request #10 from AppCoreNet/renovate-project
Added Directory.Packages.props, updated dependencies and target frame…
2 parents 39d3c7e + 9364856 commit 1f00746

33 files changed

Lines changed: 417 additions & 278 deletions

‎.github/workflows/build-test.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
with:
2727
fetch-depth: 0
2828
- name: Setup .NET
29-
uses: actions/setup-dotnet@v3
29+
uses: actions/setup-dotnet@v4
3030
with:
3131
dotnet-version: |
32-
6.0.x
3332
8.0.x
33+
9.0.x
3434
- name: Restore
3535
run: dotnet restore
3636
- name: Build
@@ -47,12 +47,12 @@ jobs:
4747
#
4848
- name: Upload artifacts
4949
if: matrix.os == 'ubuntu-latest'
50-
uses: actions/upload-artifact@v3
50+
uses: actions/upload-artifact@v4
5151
with:
5252
name: artifacts
5353
path: ./artifacts
5454
- name: Upload test results
55-
uses: actions/upload-artifact@v3
55+
uses: actions/upload-artifact@v4
5656
with:
5757
name: test-results-${{ matrix.os }}
5858
path: ./test-results
@@ -66,13 +66,13 @@ jobs:
6666
name: Deploy Testing
6767
steps:
6868
- name: Setup .NET
69-
uses: actions/setup-dotnet@v3
69+
uses: actions/setup-dotnet@v4
7070
with:
7171
dotnet-version: |
72-
6.0.x
7372
8.0.x
73+
9.0.x
7474
- name: Download artifacts
75-
uses: actions/download-artifact@v3
75+
uses: actions/download-artifact@v4
7676
with:
7777
name: artifacts
7878
path: ./artifacts
@@ -89,13 +89,13 @@ jobs:
8989
name: Deploy Production
9090
steps:
9191
- name: Setup .NET
92-
uses: actions/setup-dotnet@v3
92+
uses: actions/setup-dotnet@v4
9393
with:
9494
dotnet-version: |
95-
6.0.x
9695
8.0.x
96+
9.0.x
9797
- name: Download artifacts
98-
uses: actions/download-artifact@v3
98+
uses: actions/download-artifact@v4
9999
with:
100100
name: artifacts
101101
path: ./artifacts

‎AppCoreNet.Data.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2525
LICENSE = LICENSE
2626
README.md = README.md
2727
stylecop.json = stylecop.json
28+
Directory.Packages.props = Directory.Packages.props
29+
NuGet.config = NuGet.config
30+
renovate.json = renovate.json
2831
EndProjectSection
2932
EndProject
3033
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{80A494A8-C591-4A8D-98DF-826D2D32ECA9}"

‎Directory.Build.props‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<!-- GitVersion -->
2525
<ItemGroup>
26-
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
26+
<PackageReference Include="GitVersion.MsBuild">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>
@@ -38,7 +38,7 @@
3838
</PropertyGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
41+
<PackageReference Include="Microsoft.SourceLink.GitHub">
4242
<PrivateAssets>all</PrivateAssets>
4343
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4444
</PackageReference>
@@ -47,6 +47,7 @@
4747
<!-- Code Analysis -->
4848
<PropertyGroup>
4949
<EnableNETAnalyzers>true</EnableNETAnalyzers>
50+
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
5051
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)AppCoreNet.ruleset</CodeAnalysisRuleSet>
5152
</PropertyGroup>
5253

@@ -55,19 +56,15 @@
5556
</ItemGroup>
5657

5758
<ItemGroup>
58-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
59+
<PackageReference Include="StyleCop.Analyzers">
5960
<PrivateAssets>all</PrivateAssets>
6061
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6162
</PackageReference>
62-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
63+
<PackageReference Include="IDisposableAnalyzers">
6364
<PrivateAssets>all</PrivateAssets>
6465
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6566
</PackageReference>
66-
<PackageReference Include="IDisposableAnalyzers" Version="4.0.7">
67-
<PrivateAssets>all</PrivateAssets>
68-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
69-
</PackageReference>
70-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30">
67+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
7168
<PrivateAssets>all</PrivateAssets>
7269
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7370
</PackageReference>

‎Directory.Packages.props‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
7+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
8+
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" />
9+
<PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
10+
<PackageVersion Include="GitVersion.MsBuild" Version="6.3.0" />
11+
12+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
13+
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
14+
<PackageVersion Include="FluentAssertions" Version="8.2.0" />
15+
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
17+
<PackageVersion Include="xunit" Version="2.9.3" />
18+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
19+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
20+
21+
<PackageVersion Include="AppCoreNet.Diagnostics.Sources" Version="0.6.1" />
22+
<PackageVersion Include="AppCoreNet.TypeHelpers.Sources" Version="0.6.1" />
23+
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
24+
25+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
26+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
27+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
28+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
29+
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
30+
31+
<PackageVersion Include="AppCoreNet.Extensions.DependencyInjection.Abstractions" Version="0.6.3" />
32+
</ItemGroup>
33+
</Project>

‎GitVersion.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
workflow: GitFlow/v1
2+
mode: ContinuousDelivery
13
assembly-versioning-scheme: Major
24
assembly-file-versioning-scheme: MajorMinorPatchTag
35
assembly-informational-format: '{SemVer}+{ShortSha}'
4-
continuous-delivery-fallback-tag: 'alpha'
5-
mode: 'ContinuousDeployment'
66
branches:
77
main:
8+
label: alpha
89
increment: Minor
10+
support:
11+
label: alpha
912
pull-request:
10-
tag: 'pr'
11-
ignore:
12-
sha: []
13+
label: pr

‎NuGet.config‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
6+
</packageSources>
7+
<auditSources>
8+
<clear />
9+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
10+
</auditSources>
11+
<packageSourceMapping>
12+
<packageSource key="nuget.org">
13+
<package pattern="*" />
14+
</packageSource>
15+
</packageSourceMapping>
16+
</configuration>

‎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": "8.0.0",
3+
"version": "9.0.300",
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}

‎renovate.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended"
5+
],
6+
"packageRules": [
7+
{
8+
"groupName": "AppCoreNet.Shared",
9+
"matchSourceUrls": [
10+
"https://github.com/AppCoreNet/Shared"
11+
]
12+
},
13+
{
14+
"groupName": "AppCoreNet.Extensions",
15+
"matchSourceUrls": [
16+
"https://github.com/AppCoreNet/Extensions"
17+
]
18+
}
19+
]
20+
}

‎src/AppCoreNet.Data.Abstractions/AppCoreNet.Data.Abstractions.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;netstandard2.0;net462</TargetFrameworks>
4+
<TargetFrameworks>net8.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
55
<RootNamespace>AppCoreNet.Data</RootNamespace>
66
<Description>Provides public API for the AppCore .NET persistence framework.</Description>
77
</PropertyGroup>
88

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

1313
</Project>

‎src/AppCoreNet.Data.Abstractions/EntityExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static class EntityExtensions
1616
/// </summary>
1717
/// <typeparam name="TId">The type of the entity id.</typeparam>
1818
/// <param name="entity">The entity.</param>
19-
/// <returns><c>tru</c> if the entity is transient; <c>false</c> otherwise.</returns>
19+
/// <returns><c>true</c> if the entity is transient; <c>false</c> otherwise.</returns>
2020
public static bool IsTransient<TId>(this IEntity<TId> entity)
2121
{
2222
Ensure.Arg.NotNull(entity);

0 commit comments

Comments
 (0)