Skip to content

Commit

Permalink
Removed not working correctly Github Action with Test Results
Browse files Browse the repository at this point in the history
Added Directory.Build.props and removed some commonly shared settings
Renamed project Core.Streaming.Kafka into Core.Kafka
  • Loading branch information
oskardudycz committed Mar 3, 2022
1 parent 1134aa8 commit f69ae84
Show file tree
Hide file tree
Showing 527 changed files with 119 additions and 1,384 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/build.dotnet.yml
Expand Up @@ -29,14 +29,7 @@ jobs:
run: dotnet build --configuration Release --no-restore

- name: Run tests
run: dotnet test --configuration Release --no-build --filter Category!=SkipCI --logger "trx;LogFileName=test-results.trx"

- name: Upload test results
uses: actions/upload-artifact@v2
if: success() || failure()
with:
name: test-results
path: '**/test-results.trx'
run: dotnet test --configuration Release --no-build --filter Category!=SkipCI

- name: Stop containers
if: always()
Expand Down
4 changes: 0 additions & 4 deletions CQRS.Tests/CQRS.Tests.csproj
Expand Up @@ -2,10 +2,6 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<VSTestLogger>trx%3bLogFileName=$(MSBuildProjectName).trx</VSTestLogger>
<VSTestResultsDirectory>$(MSBuildThisFileDirectory)/bin/TestResults/$(TargetFramework)</VSTestResultsDirectory>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions CQRS.Tests/Commands/Commands.cs
@@ -1,6 +1,3 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using CQRS.Tests.TestsInfrasructure;
using MediatR;
using SharpTestsEx;
Expand Down
4 changes: 0 additions & 4 deletions CQRS.Tests/Queries/Queries.cs
@@ -1,7 +1,3 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using CQRS.Tests.TestsInfrasructure;
using MediatR;
using SharpTestsEx;
Expand Down
5 changes: 1 addition & 4 deletions CQRS.Tests/TestsInfrasructure/ServiceLocator.cs
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using MediatR;
using MediatR;

namespace CQRS.Tests.TestsInfrasructure;

Expand Down
4 changes: 0 additions & 4 deletions Core.Api.Testing/ApiFixture.cs
@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
using Core.Serialization.Newtonsoft;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.TestHost;
Expand Down
2 changes: 0 additions & 2 deletions Core.Api.Testing/Core.Api.Testing.csproj
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<IsTestProject>false</IsTestProject>
</PropertyGroup>

Expand Down
2 changes: 0 additions & 2 deletions Core.Api.Testing/ResponseExtensions.cs
@@ -1,5 +1,3 @@
using System.Net.Http;
using System.Threading.Tasks;
using Core.Serialization.Newtonsoft;
using FluentAssertions;

Expand Down
3 changes: 0 additions & 3 deletions Core.Api.Testing/TestContext.cs
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Http;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.TestHost;
using Microsoft.Extensions.DependencyInjection;
Expand Down
5 changes: 1 addition & 4 deletions Core.Api.Testing/TestWebHostBuilder.cs
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;

Expand Down
1 change: 0 additions & 1 deletion Core.ElasticSearch/Config.cs
@@ -1,4 +1,3 @@
using System;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Nest;
Expand Down
3 changes: 0 additions & 3 deletions Core.ElasticSearch/Core.ElasticSearch.csproj
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>


Expand All @@ -15,7 +13,6 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>


<ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions Core.ElasticSearch/Indices/IndexNameMapper.cs
@@ -1,6 +1,4 @@
using System;
using System.Collections.Concurrent;
using System.Linq;
using System.Collections.Concurrent;

namespace Core.ElasticSearch.Indices;

Expand Down
5 changes: 1 addition & 4 deletions Core.ElasticSearch/Projections/ElasticSearchProjection.cs
@@ -1,7 +1,4 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Core.ElasticSearch.Indices;
using Core.ElasticSearch.Indices;
using Core.Events;
using Core.Events.NoMediator;
using Core.Projections;
Expand Down
3 changes: 0 additions & 3 deletions Core.ElasticSearch/Repository/ElasticSearchRepository.cs
@@ -1,6 +1,3 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Core.ElasticSearch.Indices;
using Core.Events;
using Nest;
Expand Down
2 changes: 0 additions & 2 deletions Core.EventStoreDB/Core.EventStoreDB.csproj
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>


Expand Down
5 changes: 1 addition & 4 deletions Core.EventStoreDB/Events/AggregateStreamExtensions.cs
@@ -1,7 +1,4 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Core.Events;
using Core.Events;
using Core.EventStoreDB.Serialization;
using Core.Projections;
using EventStore.Client;
Expand Down
3 changes: 1 addition & 2 deletions Core.EventStoreDB/Events/StreamEventExtensions.cs
@@ -1,5 +1,4 @@
using System;
using Core.Events;
using Core.Events;
using Core.EventStoreDB.Serialization;
using EventStore.Client;

Expand Down
@@ -1,7 +1,4 @@
using System;
using System.Threading.Tasks;

namespace Core.EventStoreDB.OptimisticConcurrency;
namespace Core.EventStoreDB.OptimisticConcurrency;

public class EventStoreDBOptimisticConcurrencyScope
{
Expand Down
7 changes: 1 addition & 6 deletions Core.EventStoreDB/Repository/EventStoreDBRepository.cs
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Core.Aggregates;
using Core.Aggregates;
using Core.Events;
using Core.EventStoreDB.Events;
using Core.EventStoreDB.Serialization;
Expand Down
4 changes: 0 additions & 4 deletions Core.EventStoreDB/Repository/RepositoryExtensions.cs
@@ -1,9 +1,5 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Core.Aggregates;
using Core.Exceptions;
using MediatR;

namespace Core.EventStoreDB.Repository;

Expand Down
@@ -1,8 +1,4 @@
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Core.Events;
using Core.Events;
using Core.EventStoreDB.Serialization;
using EventStore.Client;

Expand Down
@@ -1,6 +1,3 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Core.Events;
using Core.Events.NoMediator;
using Core.EventStoreDB.Events;
Expand Down
@@ -1,7 +1,4 @@
using System.Threading;
using System.Threading.Tasks;

namespace Core.EventStoreDB.Subscriptions;
namespace Core.EventStoreDB.Subscriptions;

public interface ISubscriptionCheckpointRepository
{
Expand Down
@@ -1,6 +1,4 @@
using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;

namespace Core.EventStoreDB.Subscriptions;

Expand Down
7 changes: 3 additions & 4 deletions Core.Streaming.Kafka/Config.cs → Core.Kafka/Config.cs
@@ -1,16 +1,15 @@
using Core.BackgroundWorkers;
using Core.Events.External;
using Core.Streaming.Kafka.Consumers;
using Core.Streaming.Kafka.Producers;
using Core.Kafka.Consumers;
using Core.Kafka.Producers;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Logging;

namespace Core.Streaming.Kafka;
namespace Core.Kafka;

public static class Config
{

public static IServiceCollection AddKafkaProducer(this IServiceCollection services)
{
//using TryAdd to support mocking, without that it won't be possible to override in tests
Expand Down
@@ -1,6 +1,3 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Confluent.Kafka;
using Core.Events;
using Core.Events.External;
Expand All @@ -11,7 +8,7 @@
using Newtonsoft.Json;
using IEventBus = Core.Events.IEventBus;

namespace Core.Streaming.Kafka.Consumers;
namespace Core.Kafka.Consumers;

public class KafkaConsumer: IExternalEventConsumer
{
Expand Down
@@ -1,7 +1,7 @@
using Confluent.Kafka;
using Microsoft.Extensions.Configuration;

namespace Core.Streaming.Kafka.Consumers;
namespace Core.Kafka.Consumers;

public class KafkaConsumerConfig
{
Expand All @@ -17,4 +17,4 @@ public static KafkaConsumerConfig GetKafkaConsumerConfig(this IConfiguration con
{
return configuration.GetSection(DefaultConfigKey).Get<KafkaConsumerConfig>();
}
}
}
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup>
Expand Down
@@ -1,13 +1,10 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Confluent.Kafka;
using Core.Events;
using Core.Events.External;
using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;

namespace Core.Streaming.Kafka.Producers;
namespace Core.Kafka.Producers;

public class KafkaProducer: IExternalEventProducer
{
Expand Down
@@ -1,7 +1,7 @@
using Confluent.Kafka;
using Microsoft.Extensions.Configuration;

namespace Core.Streaming.Kafka.Producers;
namespace Core.Kafka.Producers;

public class KafkaProducerConfig
{
Expand All @@ -17,4 +17,4 @@ public static KafkaProducerConfig GetKafkaProducerConfig(this IConfiguration con
{
return configuration.GetSection(DefaultConfigKey).Get<KafkaProducerConfig>();
}
}
}
2 changes: 0 additions & 2 deletions Core.Marten/Aggregates/AggregateExtensions.cs
@@ -1,5 +1,3 @@
using System.Threading;
using System.Threading.Tasks;
using Core.Aggregates;
using Core.Events;
using Marten;
Expand Down
2 changes: 0 additions & 2 deletions Core.Marten/Config.cs
@@ -1,5 +1,3 @@
using System;
using System.Threading;
using Core.Ids;
using Core.Marten.Ids;
using Core.Marten.OptimisticConcurrency;
Expand Down
2 changes: 0 additions & 2 deletions Core.Marten/Core.Marten.csproj
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions Core.Marten/ExternalProjections/MartenExternalProjection.cs
@@ -1,7 +1,4 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Core.Events;
using Core.Events;
using Core.Events.NoMediator;
using Core.Projections;
using Marten;
Expand Down
1 change: 0 additions & 1 deletion Core.Marten/Ids/MartenIdGenerator.cs
@@ -1,4 +1,3 @@
using System;
using Core.Ids;
using Marten;
using Marten.Schema.Identity;
Expand Down
5 changes: 1 addition & 4 deletions Core.Marten/OptimisticConcurrency/StreamVersionProviders.cs
@@ -1,7 +1,4 @@
using System;
using System.Threading.Tasks;

namespace Core.Marten.OptimisticConcurrency;
namespace Core.Marten.OptimisticConcurrency;

public class MartenOptimisticConcurrencyScope
{
Expand Down
3 changes: 0 additions & 3 deletions Core.Marten/Repository/MartenRepository.cs
@@ -1,6 +1,3 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Core.Aggregates;
using Core.Events;
using Marten;
Expand Down
3 changes: 0 additions & 3 deletions Core.Marten/Repository/RepositoryExtensions.cs
@@ -1,6 +1,3 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Core.Aggregates;
using Core.Exceptions;

Expand Down
@@ -1,5 +1,4 @@
using System;
using Core.Serialization.Newtonsoft;
using Core.Serialization.Newtonsoft;
using Marten;
using Marten.Services.Json;
using Newtonsoft.Json.Serialization;
Expand Down
2 changes: 0 additions & 2 deletions Core.Serialization/Core.Serialization.csproj
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion Core.Testing/AggregateExtensions.cs
@@ -1,4 +1,3 @@
using System.Linq;
using Core.Aggregates;
using Core.Events;

Expand Down

0 comments on commit f69ae84

Please sign in to comment.