Skip to content

Commit a5e340a

Browse files
niemyjskiCopilot
andcommitted
fix: resolve merge conflict artifacts — duplicate NuGet ref and renamed log API
- Remove duplicate Foundatio.Repositories.Elasticsearch PackageReference introduced by merge - Fix Log.DefaultMinimumLevel → Log.DefaultLogLevel (renamed in xunit.v3 upgrade) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 041b25a commit a5e340a

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

src/Exceptionless.Core/Exceptionless.Core.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
<ProjectReference
3939
Include="..\..\..\..\Foundatio\Foundatio.Repositories\src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj"
4040
Condition="'$(ReferenceFoundatioRepositoriesSource)' == 'true'" />
41-
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.15-alpha.0.5" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
42-
<ProjectReference Include="..\..\..\..\Foundatio\Foundatio.Repositories\src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj" Condition="'$(ReferenceFoundatioRepositoriesSource)' == 'true'" />
4341
</ItemGroup>
4442

4543
<ItemGroup Label="Transitive dependency updates to resolve vulnerability warnings">

tests/Exceptionless.Tests/Migrations/FixDuplicateStacksMigrationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected override void RegisterServices(IServiceCollection services)
3939
[Fact]
4040
public async Task WillMergeDuplicatedStacks()
4141
{
42-
Log.DefaultMinimumLevel = LogLevel.Trace;
42+
Log.DefaultLogLevel = LogLevel.Trace;
4343
var originalStack = _stackData.GenerateStack();
4444
originalStack.Id = ObjectId.GenerateNewId().ToString();
4545
originalStack.TotalOccurrences = 100;

0 commit comments

Comments
 (0)