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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- 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
8 changes: 4 additions & 4 deletions .github/workflows/publish-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ jobs:
- 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.10
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
4 changes: 2 additions & 2 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 Down Expand Up @@ -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.400",
"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
2 changes: 1 addition & 1 deletion src/EntityDb.Abstractions/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net7.0": {
"System.Linq.Async": {
"type": "Direct",
"requested": "[6.0.1, )",
Expand Down
4 changes: 2 additions & 2 deletions src/EntityDb.Common/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net7.0": {
"System.Linq.Async": {
"type": "Direct",
"requested": "[6.0.1, )",
Expand All @@ -19,7 +19,7 @@
"entitydb.abstractions": {
"type": "Project",
"dependencies": {
"System.Linq.Async": "6.0.1"
"System.Linq.Async": "[6.0.1, )"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/EntityDb.InMemory/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net7.0": {
"System.Linq.Async": {
"type": "Direct",
"requested": "[6.0.1, )",
Expand All @@ -19,14 +19,14 @@
"entitydb.abstractions": {
"type": "Project",
"dependencies": {
"System.Linq.Async": "6.0.1"
"System.Linq.Async": "[6.0.1, )"
}
},
"entitydb.common": {
"type": "Project",
"dependencies": {
"EntityDb.Abstractions": "1.0.0",
"System.Linq.Async": "6.0.1"
"EntityDb.Abstractions": "[1.0.0, )",
"System.Linq.Async": "[6.0.1, )"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/EntityDb.Json/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net7.0": {
"System.Linq.Async": {
"type": "Direct",
"requested": "[6.0.1, )",
Expand All @@ -19,14 +19,14 @@
"entitydb.abstractions": {
"type": "Project",
"dependencies": {
"System.Linq.Async": "6.0.1"
"System.Linq.Async": "[6.0.1, )"
}
},
"entitydb.common": {
"type": "Project",
"dependencies": {
"EntityDb.Abstractions": "1.0.0",
"System.Linq.Async": "6.0.1"
"EntityDb.Abstractions": "[1.0.0, )",
"System.Linq.Async": "[6.0.1, )"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/EntityDb.MongoDb/EntityDb.MongoDb.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MongoDB.Driver" Version="2.17.1"/>
<PackageReference Include="MongoDB.Driver" Version="2.18.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\EntityDb.Common\EntityDb.Common.csproj"/>
<ProjectReference Include="..\EntityDb.Common\EntityDb.Common.csproj" />
</ItemGroup>

</Project>
57 changes: 38 additions & 19 deletions src/EntityDb.MongoDb/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net7.0": {
"MongoDB.Driver": {
"type": "Direct",
"requested": "[2.17.1, )",
"resolved": "2.17.1",
"contentHash": "A5Yvm3RUdkSYnvKWVb/bZfvhzG+L+t0n80JuUXf0p2QG1TbtqHE9hX/FBK+BoF7sw9rzUTw8VHYeqX5rT0rxdA==",
"requested": "[2.18.0, )",
"resolved": "2.18.0",
"contentHash": "nq7wRMeNoqUe+bndHFMDGX8IY3iSmzLoyLzzf8DRos137O+5R4NCsd9qtw/n+DoGFas0gzzyD546Cpz+5AkmLg==",
"dependencies": {
"MongoDB.Bson": "2.17.1",
"MongoDB.Driver.Core": "2.17.1",
"MongoDB.Libmongocrypt": "1.5.5"
"Microsoft.Extensions.Logging.Abstractions": "2.0.0",
"MongoDB.Bson": "2.18.0",
"MongoDB.Driver.Core": "2.18.0",
"MongoDB.Libmongocrypt": "1.6.0"
}
},
"System.Linq.Async": {
Expand All @@ -35,6 +36,11 @@
"resolved": "6.0.0",
"contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg=="
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
"resolved": "2.0.0",
"contentHash": "6ZCllUYGFukkymSTx3Yr0G/ajRxoNJp7/FqSxSB4fGISST54ifBhgu4Nc0ItGi3i6DqwuNd8SUyObmiC++AO2Q=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "5.0.0",
Expand All @@ -51,34 +57,42 @@
},
"MongoDB.Bson": {
"type": "Transitive",
"resolved": "2.17.1",
"contentHash": "IBr5w6ygeUCTobiS4J2UlYeIsnjSJvOOf31g60EkRa3NIeyrYs7Y51HeOvJ8r6NPcKv1hLj8xwoop6hDTetAdA==",
"resolved": "2.18.0",
"contentHash": "iyiVjkCAZIUiyYDZXXUqISeW7n3O/qcM90PUeJybryg7g4rXhSMRY0oLpAg+NdoXD/Qm9LlmVIePAluHQB91tQ==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "5.0.0"
}
},
"MongoDB.Driver.Core": {
"type": "Transitive",
"resolved": "2.17.1",
"contentHash": "lfuuQvCXcco6mG096PL8xRO+dBdHsDTR3DiYfK/ICHgFlL5RfKlBuE0xClEGKtaZ4Spe28/fF/GUcrrA/yfoAQ==",
"resolved": "2.18.0",
"contentHash": "/X5Ty32gyDyzs/fWFwKGS0QUhfQT3V9Sc/F8yhILBu8bjCjBscOFKQsKieAha8xxBnYS7dZvTvhvEJWT7HgJ1g==",
"dependencies": {
"DnsClient": "1.6.1",
"MongoDB.Bson": "2.17.1",
"MongoDB.Libmongocrypt": "1.5.5",
"Microsoft.Extensions.Logging.Abstractions": "2.0.0",
"MongoDB.Bson": "2.18.0",
"MongoDB.Libmongocrypt": "1.6.0",
"SharpCompress": "0.30.1",
"System.Buffers": "4.5.1"
"Snappier": "1.0.0",
"System.Buffers": "4.5.1",
"ZstdSharp.Port": "0.6.2"
}
},
"MongoDB.Libmongocrypt": {
"type": "Transitive",
"resolved": "1.5.5",
"contentHash": "0DV4l2PjXirSJHD/b+LpOK3IfUDvkbpvvZBM2w1aYL6E/4vbhfyr/FP5laDNx2zRylqN1hIZO+EL7NgO/5GpVg=="
"resolved": "1.6.0",
"contentHash": "kh+MMf+ECIf5sQDIqOdKBd75ktD5aD1EuzCX3R4HOUGPlAbeAm8harf4zwlbvFe2BLfCXZO7HajSABLf4P0GNg=="
},
"SharpCompress": {
"type": "Transitive",
"resolved": "0.30.1",
"contentHash": "XqD4TpfyYGa7QTPzaGlMVbcecKnXy4YmYLDWrU+JIj7IuRNl7DH2END+Ll7ekWIY8o3dAMWLFDE1xdhfIWD1nw=="
},
"Snappier": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "rFtK2KEI9hIe8gtx3a0YDXdHOpedIf9wYCEYtBEmtlyiWVX3XlCNV03JrmmAi/Cdfn7dxK+k0sjjcLv4fpHnqA=="
},
"System.Buffers": {
"type": "Transitive",
"resolved": "4.5.1",
Expand All @@ -103,17 +117,22 @@
"resolved": "5.0.0",
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
},
"ZstdSharp.Port": {
"type": "Transitive",
"resolved": "0.6.2",
"contentHash": "jPao/LdUNLUz8rn3H1D8W7wQbZsRZM0iayvWI4xGejJg3XJHT56gcmYdgmCGPdJF1UEBqUjucCRrFB+4HbJsbw=="
},
"entitydb.abstractions": {
"type": "Project",
"dependencies": {
"System.Linq.Async": "6.0.1"
"System.Linq.Async": "[6.0.1, )"
}
},
"entitydb.common": {
"type": "Project",
"dependencies": {
"EntityDb.Abstractions": "1.0.0",
"System.Linq.Async": "6.0.1"
"EntityDb.Abstractions": "[1.0.0, )",
"System.Linq.Async": "[6.0.1, )"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/EntityDb.Mvc/Agents/HttpContextAgentSignature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Dictionary<string, string> applicationInfo
public sealed record NameValuesPairSnapshot
(
string Name,
string[] Values
string?[] Values
);

/// <summary>
Expand Down
8 changes: 4 additions & 4 deletions src/EntityDb.Mvc/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net7.0": {
"System.Linq.Async": {
"type": "Direct",
"requested": "[6.0.1, )",
Expand All @@ -19,14 +19,14 @@
"entitydb.abstractions": {
"type": "Project",
"dependencies": {
"System.Linq.Async": "6.0.1"
"System.Linq.Async": "[6.0.1, )"
}
},
"entitydb.common": {
"type": "Project",
"dependencies": {
"EntityDb.Abstractions": "1.0.0",
"System.Linq.Async": "6.0.1"
"EntityDb.Abstractions": "[1.0.0, )",
"System.Linq.Async": "[6.0.1, )"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/EntityDb.Npgsql/EntityDb.Npgsql.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Npgsql" Version="6.0.7" />
<PackageReference Include="Npgsql" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 10 additions & 4 deletions src/EntityDb.Npgsql/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net7.0": {
"Npgsql": {
"type": "Direct",
"requested": "[6.0.7, )",
"resolved": "6.0.7",
"contentHash": "HhD5q/VUJY++tCzc0eCrhtsxmUdP7NxNhUMOdYW6sqpC6NRlFLvUDf5JyRj0gOGkXe3Tn49toaisgvLqlzQ2JQ==",
"requested": "[7.0.0, )",
"resolved": "7.0.0",
"contentHash": "tOBFksJZ2MiEz8xtDUgS5IG19jVO3nSP15QDYWiiGpXHe0PsLoQBts2Sg3hHKrrLTuw+AjsJz9iKvvGNHyKDIg==",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "6.0.0",
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
Expand All @@ -25,6 +26,11 @@
"resolved": "6.0.0",
"contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg=="
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "6.0.0",
Expand Down
Loading