Skip to content

Commit 0ee6a5f

Browse files
Revert "Merge branch 'main' into release/8.1"
This reverts commit 7e63bc7, reversing changes made to 3a90269.
1 parent 3b7755f commit 0ee6a5f

File tree

71 files changed

+3010
-1755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+3010
-1755
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
- name: Checkout Repository
2323
uses: actions/checkout@v3
2424
- name: Install .NET SDK
25-
uses: actions/setup-dotnet@v3
25+
uses: actions/setup-dotnet@v2
2626
- name: Restore Dependencies
2727
run: dotnet restore EntityDb.sln --locked-mode
2828
- name: Run Project Tests
29-
run: dotnet test EntityDb.sln --no-restore -c Debug --collect:"XPlat Code Coverage" --results-directory ./TestResults -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
29+
run: dotnet test EntityDb.sln --no-restore -c Debug --collect:"XPlat Code Coverage" -r ./TestResults -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
3030
- name: Publish Coverage Results
3131
uses: codacy/codacy-coverage-reporter-action@v1
3232
with:
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
on: pull_request
2+
3+
name: Dependabot Lockfiles Workaround
4+
5+
jobs:
6+
dependabot-lockfiles-workaround:
7+
name: Update NuGet Lockfiles
8+
if: contains(github.head_ref, 'dependabot/nuget') && github.event_name == 'pull_request'
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout Repository
12+
uses: actions/checkout@v3
13+
with:
14+
token: ${{ secrets.DEPENDABOT_LOCKFILES_WORKAROUND_PAT }}
15+
- name: Install .NET SDK
16+
uses: actions/setup-dotnet@v2
17+
- name: Force Restore Packages
18+
run: dotnet restore --force-evaluate
19+
- name: Commit Updated Lockfiles
20+
uses: stefanzweifel/git-auto-commit-action@v4
21+
with:
22+
commit_message: "chore(deps): Update NuGet Lockfiles"

.github/workflows/publish-beta.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
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-]+)*))?$'
2525
2626
if [[ ${GITHUB_MILESTONE} =~ $semantic_version_pattern ]]; then
27-
echo "is_semantic_version=true" >> $GITHUB_OUTPUT
27+
echo ::set-output name=is_semantic_version::'true'
2828
else
29-
echo "is_semantic_version=false" >> $GITHUB_OUTPUT
29+
echo ::set-output name=is_semantic_version::'false'
3030
fi
3131
beta:
3232
needs: milestone
@@ -38,17 +38,17 @@ jobs:
3838
- name: Checkout Repository
3939
uses: actions/checkout@v3
4040
- name: Install .NET SDK
41-
uses: actions/setup-dotnet@v3
41+
uses: actions/setup-dotnet@v2
4242
- name: Restore Dependencies
4343
run: dotnet restore EntityDb.sln --locked-mode
4444
- name: Run Project Tests
45-
run: dotnet test EntityDb.sln --no-restore -c Debug --collect:"XPlat Code Coverage" --results-directory ./TestResults -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
45+
run: dotnet test EntityDb.sln --no-restore -c Debug --collect:"XPlat Code Coverage" -r ./TestResults -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
4646
- name: Pack Projects into Nuget Packages
4747
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 }}'
4848
- name: Publish to Beta
4949
run: dotnet nuget push ./**/*.nupkg -s ${{ vars.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
5050
- name: Packages & Symbols Artifact
51-
uses: actions/[email protected].1
51+
uses: actions/[email protected].0
5252
with:
5353
name: Packages & Symbols
5454
path: |
@@ -60,15 +60,15 @@ jobs:
6060
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
6161
coverage-reports: ./TestResults/**/*.xml
6262
- name: Generate Coverage Report
63-
uses: danielpalme/[email protected].12
63+
uses: danielpalme/[email protected].9
6464
with:
6565
reports: './TestResults/**/coverage.opencover.xml'
6666
targetdir: 'CoverageReport'
6767
reporttypes: 'HtmlInline'
6868
license: ${{ secrets.REPORTGENERATOR_LICENSE }}
6969
toolpath: 'reportgeneratortool'
7070
- name: Coverage Report Artifact
71-
uses: actions/[email protected].1
71+
uses: actions/[email protected].0
7272
with:
7373
name: CoverageReport
7474
path: CoverageReport

.github/workflows/publish-stable.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
version: ${{ steps.get_release.outputs.tag_name }}
1515
steps:
1616
- id: get_release
17-
uses: bruceadams/get-release@v1.3.2
17+
uses: bruceadams/get-release@v1.2.3
1818
env:
1919
GITHUB_TOKEN: ${{ github.token }}
2020
- id: parse
@@ -31,9 +31,9 @@ jobs:
3131
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-]+)*))?$'
3232
3333
if [[ ${GITHUB_TAG} =~ $semantic_version_pattern ]]; then
34-
echo "is_semantic_version=true" >> $GITHUB_OUTPUT
34+
echo ::set-output name=is_semantic_version::'true'
3535
else
36-
echo "is_semantic_version=false" >> $GITHUB_OUTPUT
36+
echo ::set-output name=is_semantic_version::'false'
3737
fi
3838
3939
stable:
@@ -46,7 +46,7 @@ jobs:
4646
- name: Checkout Repository
4747
uses: actions/checkout@v3
4848
- name: Install .NET SDK
49-
uses: actions/setup-dotnet@v3
49+
uses: actions/setup-dotnet@v2
5050
- name: Restore Dependencies
5151
run: dotnet restore EntityDb.sln --locked-mode
5252
- name: Run Project Tests
@@ -56,7 +56,7 @@ jobs:
5656
- name: Publish to Stable
5757
run: dotnet nuget push ./**/*.nupkg -s ${{ vars.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
5858
- name: Packages & Symbols Artifact
59-
uses: actions/[email protected].1
59+
uses: actions/[email protected].0
6060
with:
6161
name: Packages & Symbols
6262
path: |
File renamed without changes.

Directory.Build.props

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<Project>
2+
<!--Build-->
23
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<LangVersion>10.0</LangVersion>
46
<Nullable>enable</Nullable>
7+
<EnablePreviewFeatures>True</EnablePreviewFeatures>
58
<ImplicitUsings>enable</ImplicitUsings>
6-
</PropertyGroup>
9+
</PropertyGroup>
710

811
<ItemGroup>
912
<PackageReference Include="System.Linq.Async" Version="6.0.1" />

SECURITY.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
## Supported Versions
44

5-
Version | Supported
6-
|---|---|
7-
\>= 8.0 | :white_check_mark:
8-
< 8.0 | :x:
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| 7.x.y | :white_check_mark: |
8+
| < 7.0 | :x: |
99

1010
## Reporting a Vulnerability
1111

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": "7.0.100",
3+
"version": "6.0.301",
44
"allowPrerelease": false,
55
"rollForward": "disable"
66
}

src/Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<Project>
22
<Import Project="../Directory.Build.props"/>
33

4+
<!--Build-->
45
<PropertyGroup>
56
<OutputType>Library</OutputType>
67
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
78
<GenerateDocumentationFile>true</GenerateDocumentationFile>
89
</PropertyGroup>
910

11+
<!--Pack-->
1012
<PropertyGroup>
1113
<IsPackable>true</IsPackable>
1214
<IncludeSymbols>true</IncludeSymbols>

src/EntityDb.Abstractions/Entities/IEntityRepository.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using EntityDb.Abstractions.Snapshots;
33
using EntityDb.Abstractions.Transactions;
44
using EntityDb.Abstractions.ValueObjects;
5+
using System.Diagnostics.CodeAnalysis;
56

67
namespace EntityDb.Abstractions.Entities;
78

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

25+
/// <ignore />
26+
[Obsolete("Please use GetSnapshot(...) instead. This method will be removed at a later date.")]
27+
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
28+
public Task<TEntity> GetCurrent(Id entityId, CancellationToken cancellationToken = default)
29+
{
30+
return GetSnapshot(entityId, cancellationToken);
31+
}
32+
33+
/// <ignore />
34+
[Obsolete("Please use GetSnapshot(...) instead. This method will be removed at a later date.")]
35+
[ExcludeFromCodeCoverage(Justification = "Obsolete")]
36+
Task<TEntity> GetAtVersion(Id entityId, VersionNumber lteVersionNumber,
37+
CancellationToken cancellationToken = default)
38+
{
39+
return GetSnapshot(entityId + lteVersionNumber, cancellationToken);
40+
}
41+
2442
/// <summary>
2543
/// Returns the snapshot of a <typeparamref name="TEntity" /> for a given <see cref="Pointer" />.
2644
/// </summary>

0 commit comments

Comments
 (0)