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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Install .NET SDK
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v3
- name: Restore Dependencies
run: dotnet restore EntityDb.sln --locked-mode
- name: Run Project Tests
run: dotnet test EntityDb.sln --no-restore -c Debug --collect:"XPlat Code Coverage" -r ./TestResults -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
run: dotnet test EntityDb.sln --no-restore -c Debug --collect:"XPlat Code Coverage" --results-directory ./TestResults -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
- name: Publish Coverage Results
uses: codacy/codacy-coverage-reporter-action@v1
with:
Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/dependabot-lockfiles-workaround.yml

This file was deleted.

14 changes: 7 additions & 7 deletions .github/workflows/publish-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
semantic_version_pattern='^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$'

if [[ ${GITHUB_MILESTONE} =~ $semantic_version_pattern ]]; then
echo ::set-output name=is_semantic_version::'true'
echo "is_semantic_version=true" >> $GITHUB_OUTPUT
else
echo ::set-output name=is_semantic_version::'false'
echo "is_semantic_version=false" >> $GITHUB_OUTPUT
fi
beta:
needs: milestone
Expand All @@ -38,17 +38,17 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Install .NET SDK
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v3
- name: Restore Dependencies
run: dotnet restore EntityDb.sln --locked-mode
- name: Run Project Tests
run: dotnet test EntityDb.sln --no-restore -c Debug --collect:"XPlat Code Coverage" -r ./TestResults -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
run: dotnet test EntityDb.sln --no-restore -c Debug --collect:"XPlat Code Coverage" --results-directory ./TestResults -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
- name: Pack Projects into Nuget Packages
run: dotnet pack EntityDb.sln --no-restore -c Release /p:Version='${{ needs.milestone.outputs.version }}-beta.${{ github.event.number }}.${{ github.run_number }}.${{ github.run_attempt }}'
- name: Publish to Beta
run: dotnet nuget push ./**/*.nupkg -s ${{ secrets.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
- name: Packages & Symbols Artifact
uses: actions/upload-artifact@v3.1.0
uses: actions/upload-artifact@v3.1.1
with:
name: Packages & Symbols
path: |
Expand All @@ -60,15 +60,15 @@ jobs:
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
coverage-reports: ./TestResults/**/*.xml
- name: Generate Coverage Report
uses: danielpalme/ReportGenerator-GitHub-Action@5.1.9
uses: danielpalme/ReportGenerator-GitHub-Action@5.1.12
with:
reports: './TestResults/**/coverage.opencover.xml'
targetdir: 'CoverageReport'
reporttypes: 'HtmlInline'
license: ${{ secrets.REPORTGENERATOR_LICENSE }}
toolpath: 'reportgeneratortool'
- name: Coverage Report Artifact
uses: actions/upload-artifact@v3.1.0
uses: actions/upload-artifact@v3.1.1
with:
name: CoverageReport
path: CoverageReport
10 changes: 5 additions & 5 deletions .github/workflows/publish-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
version: ${{ steps.get_release.outputs.tag_name }}
steps:
- id: get_release
uses: bruceadams/get-release@v1.2.3
uses: bruceadams/get-release@v1.3.2
env:
GITHUB_TOKEN: ${{ github.token }}
- id: parse
Expand All @@ -31,9 +31,9 @@ jobs:
semantic_version_pattern='^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$'

if [[ ${GITHUB_TAG} =~ $semantic_version_pattern ]]; then
echo ::set-output name=is_semantic_version::'true'
echo "is_semantic_version=true" >> $GITHUB_OUTPUT
else
echo ::set-output name=is_semantic_version::'false'
echo "is_semantic_version=false" >> $GITHUB_OUTPUT
fi

stable:
Expand All @@ -46,7 +46,7 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Install .NET SDK
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v3
- name: Restore Dependencies
run: dotnet restore EntityDb.sln --locked-mode
- name: Run Project Tests
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Publish to Stable
run: dotnet nuget push ./**/*.nupkg -s ${{ secrets.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
- name: Packages & Symbols Artifact
uses: actions/upload-artifact@v3.1.0
uses: actions/upload-artifact@v3.1.1
with:
name: Packages & Symbols
path: |
Expand Down
7 changes: 2 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<Project>
<!--Build-->
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>10.0</LangVersion>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<EnablePreviewFeatures>True</EnablePreviewFeatures>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.301",
"version": "7.0.100",
"allowPrerelease": false,
"rollForward": "disable"
}
Expand Down
2 changes: 0 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<Project>
<Import Project="../Directory.Build.props"/>

<!--Build-->
<PropertyGroup>
<OutputType>Library</OutputType>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<!--Pack-->
<PropertyGroup>
<IsPackable>true</IsPackable>
<IncludeSymbols>true</IncludeSymbols>
Expand Down
18 changes: 0 additions & 18 deletions src/EntityDb.Abstractions/Entities/IEntityRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using EntityDb.Abstractions.Snapshots;
using EntityDb.Abstractions.Transactions;
using EntityDb.Abstractions.ValueObjects;
using System.Diagnostics.CodeAnalysis;

namespace EntityDb.Abstractions.Entities;

Expand All @@ -22,23 +21,6 @@ public interface IEntityRepository<TEntity> : IDisposableResource
/// </summary>
ISnapshotRepository<TEntity>? SnapshotRepository { get; }

/// <ignore />
[Obsolete("Please use GetSnapshot(...) instead. This method will be removed at a later date.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
public Task<TEntity> GetCurrent(Id entityId, CancellationToken cancellationToken = default)
{
return GetSnapshot(entityId, cancellationToken);
}

/// <ignore />
[Obsolete("Please use GetSnapshot(...) instead. This method will be removed at a later date.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
Task<TEntity> GetAtVersion(Id entityId, VersionNumber lteVersionNumber,
CancellationToken cancellationToken = default)
{
return GetSnapshot(entityId + lteVersionNumber, cancellationToken);
}

/// <summary>
/// Returns the snapshot of a <typeparamref name="TEntity" /> for a given <see cref="Pointer" />.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using EntityDb.Abstractions.Snapshots;
using EntityDb.Abstractions.Transactions;
using EntityDb.Abstractions.ValueObjects;
using System.Diagnostics.CodeAnalysis;

namespace EntityDb.Abstractions.Projections;

Expand All @@ -22,14 +21,6 @@ public interface IProjectionRepository<TProjection> : IDisposableResource
/// </summary>
ISnapshotRepository<TProjection>? SnapshotRepository { get; }

/// <ignore />
[Obsolete("Please use GetSnapshot(...) instead. This method will be removed at a later date.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
public Task<TProjection> GetCurrent(Id projectionId, CancellationToken cancellationToken = default)
{
return GetSnapshot(projectionId, cancellationToken);
}

/// <summary>
/// Returns the snapshot of a <typeparamref name="TProjection" /> for a given <see cref="Pointer" />.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using EntityDb.Abstractions.ValueObjects;
using System.Diagnostics.CodeAnalysis;
using System.Linq.Expressions;

namespace EntityDb.Abstractions.Queries.FilterBuilders;

Expand All @@ -10,12 +8,6 @@ namespace EntityDb.Abstractions.Queries.FilterBuilders;
/// <typeparam name="TFilter">The type of filter used by the repository.</typeparam>
public interface IAgentSignatureFilterBuilder<TFilter> : IFilterBuilder<TFilter>
{
/// <ignore/>
[Obsolete("This method will be removed in the future, and may not be supported for all implementations.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
TFilter AgentSignatureMatches<TAgentSignature>(Expression<Func<TAgentSignature, bool>> agentSignatureExpression)
=> throw new NotSupportedException();

/// <summary>
/// Returns a <typeparamref name="TFilter" /> that only includes agentSignatures with any entity id which is contained
/// in a set
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using EntityDb.Abstractions.ValueObjects;
using System.Diagnostics.CodeAnalysis;
using System.Linq.Expressions;

namespace EntityDb.Abstractions.Queries.FilterBuilders;

Expand All @@ -10,12 +8,6 @@ namespace EntityDb.Abstractions.Queries.FilterBuilders;
/// <typeparam name="TFilter">The type of filter used by the repository.</typeparam>
public interface ICommandFilterBuilder<TFilter> : IFilterBuilder<TFilter>
{
/// <ignore/>
[Obsolete("This method will be removed in the future, and may not be supported for all implementations.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
TFilter CommandMatches<TCommand>(Expression<Func<TCommand, bool>> commandExpression)
=> throw new NotSupportedException();

/// <summary>
/// Returns a <typeparamref name="TFilter" /> that only includes commands with an entity id which is contained in a set
/// of entity ids.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using EntityDb.Abstractions.Leases;
using EntityDb.Abstractions.ValueObjects;
using System.Diagnostics.CodeAnalysis;
using System.Linq.Expressions;

namespace EntityDb.Abstractions.Queries.FilterBuilders;

Expand All @@ -11,12 +9,6 @@ namespace EntityDb.Abstractions.Queries.FilterBuilders;
/// <typeparam name="TFilter">The type of filter used by the repository.</typeparam>
public interface ILeaseFilterBuilder<TFilter> : IFilterBuilder<TFilter>
{
/// <ignore/>
[Obsolete("This method will be removed in the future.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
TFilter LeaseMatches<TLease>(Expression<Func<TLease, bool>> leaseExpression)
=> throw new NotSupportedException();

/// <summary>
/// Returns a <typeparamref name="TFilter" /> that only includes leases with an entity id which is contained in a set
/// of entity ids.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using EntityDb.Abstractions.Tags;
using EntityDb.Abstractions.ValueObjects;
using System.Diagnostics.CodeAnalysis;
using System.Linq.Expressions;

namespace EntityDb.Abstractions.Queries.FilterBuilders;

Expand All @@ -11,12 +9,6 @@ namespace EntityDb.Abstractions.Queries.FilterBuilders;
/// <typeparam name="TFilter">The type of filter used by the repository.</typeparam>
public interface ITagFilterBuilder<TFilter> : IFilterBuilder<TFilter>
{
/// <ignore/>
[Obsolete("This method will be removed in the future, and may not be supported for all implementations.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
TFilter TagMatches<TTag>(Expression<Func<TTag, bool>> tagExpression)
=> throw new NotSupportedException();

/// <summary>
/// Returns a <typeparamref name="TFilter" /> that only includes tags with an entity id which is contained in a set of
/// entity ids.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq.Expressions;

namespace EntityDb.Abstractions.Queries.SortBuilders;
namespace EntityDb.Abstractions.Queries.SortBuilders;

/// <summary>
/// Builds a <typeparamref name="TSort" /> for a agentSignature query.
/// </summary>
/// <typeparam name="TSort">The type of sort used by the repository.</typeparam>
public interface IAgentSignatureSortBuilder<TSort> : ISortBuilder<TSort>
{
/// <ignore/>
[Obsolete("This method will be removed in the future, and may not be supported for all implementations.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
TSort AgentSignatureProperty<TAgentSignature>(bool ascending,
Expression<Func<TAgentSignature, object>> agentSignatureExpression)
=> throw new NotSupportedException();

/// <summary>
/// Returns a <typeparamref name="TSort" /> that orders agentSignatures by entity ids.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq.Expressions;

namespace EntityDb.Abstractions.Queries.SortBuilders;
namespace EntityDb.Abstractions.Queries.SortBuilders;

/// <summary>
/// Builds a <typeparamref name="TSort" /> for a command query.
/// </summary>
/// <typeparam name="TSort">The type of sort used by the repository.</typeparam>
public interface ICommandSortBuilder<TSort> : ISortBuilder<TSort>
{
/// <ignore/>
[Obsolete("This method will be removed in the future, and may not be supported for all implementations.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
TSort CommandProperty<TCommand>(bool ascending, Expression<Func<TCommand, object>> commandExpression)
=> throw new NotSupportedException();

/// <summary>
/// Returns a <typeparamref name="TSort" /> that orders commands by entity id.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using EntityDb.Abstractions.Leases;
using System.Diagnostics.CodeAnalysis;
using System.Linq.Expressions;

namespace EntityDb.Abstractions.Queries.SortBuilders;

Expand All @@ -10,12 +8,6 @@ namespace EntityDb.Abstractions.Queries.SortBuilders;
/// <typeparam name="TSort">The type of sort used by the repository.</typeparam>
public interface ILeaseSortBuilder<TSort> : ISortBuilder<TSort>
{
/// <ignore/>
[Obsolete("This method will be removed in the future, and may not be supported for all implementations.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
TSort LeaseProperty<TLease>(bool ascending, Expression<Func<TLease, object>> leaseExpression)
=> throw new NotSupportedException();

/// <summary>
/// Returns a <typeparamref name="TSort" /> that orders leases by entity id.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using EntityDb.Abstractions.Tags;
using System.Diagnostics.CodeAnalysis;
using System.Linq.Expressions;

namespace EntityDb.Abstractions.Queries.SortBuilders;

Expand All @@ -10,12 +8,6 @@ namespace EntityDb.Abstractions.Queries.SortBuilders;
/// <typeparam name="TSort">The type of sort used by the repository.</typeparam>
public interface ITagSortBuilder<TSort> : ISortBuilder<TSort>
{
/// <ignore/>
[Obsolete("This method will be removed in the future, and may not be supported for all implementations.")]
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
TSort TagProperty<TTag>(bool ascending, Expression<Func<TTag, object>> tagExpression)
=> throw new NotSupportedException();

/// <summary>
/// Returns a <typeparamref name="TSort" /> that orders tags by entity id.
/// </summary>
Expand Down
Loading