diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 4e91882ef..044ca76e2 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -42,11 +42,11 @@ jobs: 8.0.x 9.0.x - name: Install dependencies - run: dotnet restore Motor.NET.sln + run: dotnet restore Motor.NET.slnx - name: Build - run: dotnet build --configuration Release --no-restore Motor.NET.sln + run: dotnet build --configuration Release --no-restore Motor.NET.slnx - name: Pack - run: dotnet pack -v minimal -c Release --no-restore -o ./artifacts Motor.NET.sln + run: dotnet pack -v minimal -c Release --no-restore -o ./artifacts Motor.NET.slnx - name: Publish Bridge run: dotnet publish --framework net9.0 -v minimal -c Release --no-restore -o ./artifacts-bridge ./src/Motor.Extensions.Hosting.Bridge/Motor.Extensions.Hosting.Bridge.csproj - name: Upload Artifact @@ -72,9 +72,9 @@ jobs: dotnet-version: | 8.0.x - name: Install dependencies - run: dotnet restore Motor.NET.sln + run: dotnet restore Motor.NET.slnx - name: Test .NET8 - run: dotnet test --no-restore Motor.NET.sln --framework net8.0 + run: dotnet test --no-restore Motor.NET.slnx --framework net8.0 test-net9: runs-on: ubuntu-latest @@ -86,9 +86,9 @@ jobs: dotnet-version: | 8.0.x - name: Install dependencies - run: dotnet restore Motor.NET.sln + run: dotnet restore Motor.NET.slnx - name: Test .NET9 - run: dotnet test --no-restore Motor.NET.sln --framework net9.0 + run: dotnet test --no-restore Motor.NET.slnx --framework net9.0 #code-ql: @@ -104,9 +104,9 @@ jobs: # with: # dotnet-version: 7.0.x # - name: Install dependencies - # run: dotnet restore Motor.NET.sln + # run: dotnet restore Motor.NET.slnx # - name: Build - # run: dotnet build --configuration Release --no-restore Motor.NET.sln + # run: dotnet build --configuration Release --no-restore Motor.NET.slnx # - name: Perform CodeQL Analysis # uses: github/codeql-action/analyze@v1 diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..7c86ecaa8 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,72 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Motor.NET.slnx b/Motor.NET.slnx new file mode 100644 index 000000000..f75fa2b3e --- /dev/null +++ b/Motor.NET.slnx @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/AspNetExample/AspNetExample.csproj b/examples/AspNetExample/AspNetExample.csproj index c7072bf04..fd42011e1 100644 --- a/examples/AspNetExample/AspNetExample.csproj +++ b/examples/AspNetExample/AspNetExample.csproj @@ -10,11 +10,11 @@ true - - + + - + diff --git a/examples/AspNetExample_IntegrationTest/AspNetExample_IntegrationTest.csproj b/examples/AspNetExample_IntegrationTest/AspNetExample_IntegrationTest.csproj index 11997f61c..3e3015680 100644 --- a/examples/AspNetExample_IntegrationTest/AspNetExample_IntegrationTest.csproj +++ b/examples/AspNetExample_IntegrationTest/AspNetExample_IntegrationTest.csproj @@ -5,15 +5,11 @@ enable - - - - - + + + + + diff --git a/examples/ConsumeAndPublishWithKafka_IntegrationTest/ConsumeAndPublishWithKafka_IntegrationTest.csproj b/examples/ConsumeAndPublishWithKafka_IntegrationTest/ConsumeAndPublishWithKafka_IntegrationTest.csproj index 62576df49..bfa745900 100644 --- a/examples/ConsumeAndPublishWithKafka_IntegrationTest/ConsumeAndPublishWithKafka_IntegrationTest.csproj +++ b/examples/ConsumeAndPublishWithKafka_IntegrationTest/ConsumeAndPublishWithKafka_IntegrationTest.csproj @@ -6,10 +6,10 @@ false - - - - + + + + diff --git a/shared.csproj b/src/Directory.Build.props similarity index 85% rename from shared.csproj rename to src/Directory.Build.props index 32ced0cf0..ec375c7f2 100644 --- a/shared.csproj +++ b/src/Directory.Build.props @@ -1,9 +1,11 @@ 0.16.0 + net8.0;net9.0; 11 enable CS8600;CS8602;CS8625;CS8618;CS8604;CS8601 + true true @@ -24,6 +26,6 @@ - + diff --git a/src/Motor.Extensions.ContentEncoding.Abstractions/Motor.Extensions.ContentEncoding.Abstractions.csproj b/src/Motor.Extensions.ContentEncoding.Abstractions/Motor.Extensions.ContentEncoding.Abstractions.csproj index 97ae36b41..a08451df3 100644 --- a/src/Motor.Extensions.ContentEncoding.Abstractions/Motor.Extensions.ContentEncoding.Abstractions.csproj +++ b/src/Motor.Extensions.ContentEncoding.Abstractions/Motor.Extensions.ContentEncoding.Abstractions.csproj @@ -1,12 +1,8 @@ - - net8.0;net9.0 - - + - diff --git a/src/Motor.Extensions.ContentEncoding.Gzip/Motor.Extensions.ContentEncoding.Gzip.csproj b/src/Motor.Extensions.ContentEncoding.Gzip/Motor.Extensions.ContentEncoding.Gzip.csproj index 97887a6b0..3c2f1af54 100644 --- a/src/Motor.Extensions.ContentEncoding.Gzip/Motor.Extensions.ContentEncoding.Gzip.csproj +++ b/src/Motor.Extensions.ContentEncoding.Gzip/Motor.Extensions.ContentEncoding.Gzip.csproj @@ -1,10 +1,6 @@ - - net8.0;net9.0 - - diff --git a/src/Motor.Extensions.Conversion.Abstractions/Motor.Extensions.Conversion.Abstractions.csproj b/src/Motor.Extensions.Conversion.Abstractions/Motor.Extensions.Conversion.Abstractions.csproj index 3681de29b..e6c35ecaf 100644 --- a/src/Motor.Extensions.Conversion.Abstractions/Motor.Extensions.Conversion.Abstractions.csproj +++ b/src/Motor.Extensions.Conversion.Abstractions/Motor.Extensions.Conversion.Abstractions.csproj @@ -1,6 +1 @@ - - - net8.0;net9.0 - - - + diff --git a/src/Motor.Extensions.Conversion.JsonNet/Motor.Extensions.Conversion.JsonNet.csproj b/src/Motor.Extensions.Conversion.JsonNet/Motor.Extensions.Conversion.JsonNet.csproj index 3d479440e..e449241e5 100644 --- a/src/Motor.Extensions.Conversion.JsonNet/Motor.Extensions.Conversion.JsonNet.csproj +++ b/src/Motor.Extensions.Conversion.JsonNet/Motor.Extensions.Conversion.JsonNet.csproj @@ -1,15 +1,11 @@ - - net8.0;net9.0 - - - - + + + - diff --git a/src/Motor.Extensions.Conversion.Protobuf/Motor.Extensions.Conversion.Protobuf.csproj b/src/Motor.Extensions.Conversion.Protobuf/Motor.Extensions.Conversion.Protobuf.csproj index fe66623d5..4cd087903 100644 --- a/src/Motor.Extensions.Conversion.Protobuf/Motor.Extensions.Conversion.Protobuf.csproj +++ b/src/Motor.Extensions.Conversion.Protobuf/Motor.Extensions.Conversion.Protobuf.csproj @@ -1,15 +1,11 @@ - - net8.0;net9.0 - - - - + + + - diff --git a/src/Motor.Extensions.Conversion.SystemJson/Motor.Extensions.Conversion.SystemJson.csproj b/src/Motor.Extensions.Conversion.SystemJson/Motor.Extensions.Conversion.SystemJson.csproj index 9816eca1c..163feb761 100644 --- a/src/Motor.Extensions.Conversion.SystemJson/Motor.Extensions.Conversion.SystemJson.csproj +++ b/src/Motor.Extensions.Conversion.SystemJson/Motor.Extensions.Conversion.SystemJson.csproj @@ -1,15 +1,11 @@ - - net8.0;net9.0 - - - - + + + - diff --git a/src/Motor.Extensions.Diagnostics.HealthChecks/Motor.Extensions.Diagnostics.HealthChecks.csproj b/src/Motor.Extensions.Diagnostics.HealthChecks/Motor.Extensions.Diagnostics.HealthChecks.csproj index dc7947e9e..90fbca3b7 100644 --- a/src/Motor.Extensions.Diagnostics.HealthChecks/Motor.Extensions.Diagnostics.HealthChecks.csproj +++ b/src/Motor.Extensions.Diagnostics.HealthChecks/Motor.Extensions.Diagnostics.HealthChecks.csproj @@ -1,9 +1,5 @@ - - net8.0;net9.0 - - diff --git a/src/Motor.Extensions.Diagnostics.Logging/Motor.Extensions.Diagnostics.Logging.csproj b/src/Motor.Extensions.Diagnostics.Logging/Motor.Extensions.Diagnostics.Logging.csproj index 69b655162..04a173a8d 100644 --- a/src/Motor.Extensions.Diagnostics.Logging/Motor.Extensions.Diagnostics.Logging.csproj +++ b/src/Motor.Extensions.Diagnostics.Logging/Motor.Extensions.Diagnostics.Logging.csproj @@ -1,18 +1,14 @@ - - net8.0;net9.0 - - - - - - + + + + + - + - diff --git a/src/Motor.Extensions.Diagnostics.Metrics.Abstractions/Motor.Extensions.Diagnostics.Metrics.Abstractions.csproj b/src/Motor.Extensions.Diagnostics.Metrics.Abstractions/Motor.Extensions.Diagnostics.Metrics.Abstractions.csproj index a4f3e28d3..1d7f161fc 100644 --- a/src/Motor.Extensions.Diagnostics.Metrics.Abstractions/Motor.Extensions.Diagnostics.Metrics.Abstractions.csproj +++ b/src/Motor.Extensions.Diagnostics.Metrics.Abstractions/Motor.Extensions.Diagnostics.Metrics.Abstractions.csproj @@ -1,9 +1,5 @@ - - net8.0;net9.0 - - + - diff --git a/src/Motor.Extensions.Diagnostics.Metrics/Motor.Extensions.Diagnostics.Metrics.csproj b/src/Motor.Extensions.Diagnostics.Metrics/Motor.Extensions.Diagnostics.Metrics.csproj index bfeb031f0..1ab0e99bc 100644 --- a/src/Motor.Extensions.Diagnostics.Metrics/Motor.Extensions.Diagnostics.Metrics.csproj +++ b/src/Motor.Extensions.Diagnostics.Metrics/Motor.Extensions.Diagnostics.Metrics.csproj @@ -1,7 +1,4 @@ - - net8.0;net9.0 - @@ -11,18 +8,17 @@ - - - - - - + + + + + + - + - diff --git a/src/Motor.Extensions.Diagnostics.Queue.Abstractions/Motor.Extensions.Diagnostics.Queue.Abstractions.csproj b/src/Motor.Extensions.Diagnostics.Queue.Abstractions/Motor.Extensions.Diagnostics.Queue.Abstractions.csproj index 3681de29b..e6c35ecaf 100644 --- a/src/Motor.Extensions.Diagnostics.Queue.Abstractions/Motor.Extensions.Diagnostics.Queue.Abstractions.csproj +++ b/src/Motor.Extensions.Diagnostics.Queue.Abstractions/Motor.Extensions.Diagnostics.Queue.Abstractions.csproj @@ -1,6 +1 @@ - - - net8.0;net9.0 - - - + diff --git a/src/Motor.Extensions.Diagnostics.Queue.Metrics/Motor.Extensions.Diagnostics.Queue.Metrics.csproj b/src/Motor.Extensions.Diagnostics.Queue.Metrics/Motor.Extensions.Diagnostics.Queue.Metrics.csproj index 88459b540..181766b5a 100644 --- a/src/Motor.Extensions.Diagnostics.Queue.Metrics/Motor.Extensions.Diagnostics.Queue.Metrics.csproj +++ b/src/Motor.Extensions.Diagnostics.Queue.Metrics/Motor.Extensions.Diagnostics.Queue.Metrics.csproj @@ -1,14 +1,10 @@ - - net8.0;net9.0 - - - + + - diff --git a/src/Motor.Extensions.Diagnostics.Sentry/Motor.Extensions.Diagnostics.Sentry.csproj b/src/Motor.Extensions.Diagnostics.Sentry/Motor.Extensions.Diagnostics.Sentry.csproj index aa49adb97..1f7f1ed11 100644 --- a/src/Motor.Extensions.Diagnostics.Sentry/Motor.Extensions.Diagnostics.Sentry.csproj +++ b/src/Motor.Extensions.Diagnostics.Sentry/Motor.Extensions.Diagnostics.Sentry.csproj @@ -1,15 +1,11 @@ - - net8.0;net9.0 - - - - + + + - + - diff --git a/src/Motor.Extensions.Diagnostics.Telemetry/Motor.Extensions.Diagnostics.Telemetry.csproj b/src/Motor.Extensions.Diagnostics.Telemetry/Motor.Extensions.Diagnostics.Telemetry.csproj index 518adeafb..e53daf17c 100644 --- a/src/Motor.Extensions.Diagnostics.Telemetry/Motor.Extensions.Diagnostics.Telemetry.csproj +++ b/src/Motor.Extensions.Diagnostics.Telemetry/Motor.Extensions.Diagnostics.Telemetry.csproj @@ -1,21 +1,17 @@ - - net8.0;net9.0 - - - - - - - - - + + + + + + + + - + - diff --git a/src/Motor.Extensions.Diagnostics.Tracing/Motor.Extensions.Diagnostics.Tracing.csproj b/src/Motor.Extensions.Diagnostics.Tracing/Motor.Extensions.Diagnostics.Tracing.csproj index a58b241f4..0e14aade9 100644 --- a/src/Motor.Extensions.Diagnostics.Tracing/Motor.Extensions.Diagnostics.Tracing.csproj +++ b/src/Motor.Extensions.Diagnostics.Tracing/Motor.Extensions.Diagnostics.Tracing.csproj @@ -1,9 +1,5 @@ - - net8.0;net9.0 - - diff --git a/src/Motor.Extensions.Hosting.Abstractions/Motor.Extensions.Hosting.Abstractions.csproj b/src/Motor.Extensions.Hosting.Abstractions/Motor.Extensions.Hosting.Abstractions.csproj index 679733f45..270455d45 100644 --- a/src/Motor.Extensions.Hosting.Abstractions/Motor.Extensions.Hosting.Abstractions.csproj +++ b/src/Motor.Extensions.Hosting.Abstractions/Motor.Extensions.Hosting.Abstractions.csproj @@ -1,18 +1,14 @@ - - net8.0;net9.0 - - - - - + + + + - + - diff --git a/src/Motor.Extensions.Hosting.BackgroundService/Motor.Extensions.Hosting.BackgroundService.csproj b/src/Motor.Extensions.Hosting.BackgroundService/Motor.Extensions.Hosting.BackgroundService.csproj index c20794989..1a9180b9f 100644 --- a/src/Motor.Extensions.Hosting.BackgroundService/Motor.Extensions.Hosting.BackgroundService.csproj +++ b/src/Motor.Extensions.Hosting.BackgroundService/Motor.Extensions.Hosting.BackgroundService.csproj @@ -1,9 +1,5 @@  - - net8.0;net9.0 - - + - diff --git a/src/Motor.Extensions.Hosting.Bridge/Motor.Extensions.Hosting.Bridge.csproj b/src/Motor.Extensions.Hosting.Bridge/Motor.Extensions.Hosting.Bridge.csproj index e9d0b677a..049b625c5 100644 --- a/src/Motor.Extensions.Hosting.Bridge/Motor.Extensions.Hosting.Bridge.csproj +++ b/src/Motor.Extensions.Hosting.Bridge/Motor.Extensions.Hosting.Bridge.csproj @@ -1,6 +1,5 @@ - net8.0;net9.0 Exe Motor.NET/bridge @@ -19,5 +18,4 @@ PreserveNewest - diff --git a/src/Motor.Extensions.Hosting.CloudEvents/Motor.Extensions.Hosting.CloudEvents.csproj b/src/Motor.Extensions.Hosting.CloudEvents/Motor.Extensions.Hosting.CloudEvents.csproj index 8755a50a5..90af88d2f 100644 --- a/src/Motor.Extensions.Hosting.CloudEvents/Motor.Extensions.Hosting.CloudEvents.csproj +++ b/src/Motor.Extensions.Hosting.CloudEvents/Motor.Extensions.Hosting.CloudEvents.csproj @@ -1,9 +1,5 @@ - - net8.0;net9.0 - - + - diff --git a/src/Motor.Extensions.Hosting.Consumer/Motor.Extensions.Hosting.Consumer.csproj b/src/Motor.Extensions.Hosting.Consumer/Motor.Extensions.Hosting.Consumer.csproj index 7b83a1b08..2728d38da 100644 --- a/src/Motor.Extensions.Hosting.Consumer/Motor.Extensions.Hosting.Consumer.csproj +++ b/src/Motor.Extensions.Hosting.Consumer/Motor.Extensions.Hosting.Consumer.csproj @@ -1,7 +1,4 @@ - - net8.0;net9.0 - @@ -9,5 +6,4 @@ - diff --git a/src/Motor.Extensions.Hosting.Kafka/Motor.Extensions.Hosting.Kafka.csproj b/src/Motor.Extensions.Hosting.Kafka/Motor.Extensions.Hosting.Kafka.csproj index 8a9dbdbc1..0e069df1e 100644 --- a/src/Motor.Extensions.Hosting.Kafka/Motor.Extensions.Hosting.Kafka.csproj +++ b/src/Motor.Extensions.Hosting.Kafka/Motor.Extensions.Hosting.Kafka.csproj @@ -1,23 +1,19 @@ - - net8.0;net9.0 - - - - - - - - - + + + + + + + + - diff --git a/src/Motor.Extensions.Hosting.NATS/Motor.Extensions.Hosting.NATS.csproj b/src/Motor.Extensions.Hosting.NATS/Motor.Extensions.Hosting.NATS.csproj index c2e66770d..a4de09cde 100644 --- a/src/Motor.Extensions.Hosting.NATS/Motor.Extensions.Hosting.NATS.csproj +++ b/src/Motor.Extensions.Hosting.NATS/Motor.Extensions.Hosting.NATS.csproj @@ -1,19 +1,15 @@ - - net8.0;net9.0 - - - - - - - + + + + + + - diff --git a/src/Motor.Extensions.Hosting.Publisher/Motor.Extensions.Hosting.Publisher.csproj b/src/Motor.Extensions.Hosting.Publisher/Motor.Extensions.Hosting.Publisher.csproj index 398289d05..fa26f1447 100644 --- a/src/Motor.Extensions.Hosting.Publisher/Motor.Extensions.Hosting.Publisher.csproj +++ b/src/Motor.Extensions.Hosting.Publisher/Motor.Extensions.Hosting.Publisher.csproj @@ -1,7 +1,4 @@ - - net8.0;net9.0 - @@ -10,5 +7,4 @@ - diff --git a/src/Motor.Extensions.Hosting.RabbitMQ/Motor.Extensions.Hosting.RabbitMQ.csproj b/src/Motor.Extensions.Hosting.RabbitMQ/Motor.Extensions.Hosting.RabbitMQ.csproj index de1a99b32..78065e759 100644 --- a/src/Motor.Extensions.Hosting.RabbitMQ/Motor.Extensions.Hosting.RabbitMQ.csproj +++ b/src/Motor.Extensions.Hosting.RabbitMQ/Motor.Extensions.Hosting.RabbitMQ.csproj @@ -1,14 +1,11 @@ - - net8.0;net9.0 - - - - - - - + + + + + + @@ -20,5 +17,4 @@ <_Parameter1>$(AssemblyName)_UnitTest - diff --git a/src/Motor.Extensions.Hosting.SQS/Motor.Extensions.Hosting.SQS.csproj b/src/Motor.Extensions.Hosting.SQS/Motor.Extensions.Hosting.SQS.csproj index 63d7a5922..5b196d6e2 100644 --- a/src/Motor.Extensions.Hosting.SQS/Motor.Extensions.Hosting.SQS.csproj +++ b/src/Motor.Extensions.Hosting.SQS/Motor.Extensions.Hosting.SQS.csproj @@ -1,17 +1,13 @@ - - net8.0;net9.0 - - - - - - + + + + + - diff --git a/src/Motor.Extensions.Hosting.Timer/Motor.Extensions.Hosting.Timer.csproj b/src/Motor.Extensions.Hosting.Timer/Motor.Extensions.Hosting.Timer.csproj index f3fc0959c..6f6b5f96d 100644 --- a/src/Motor.Extensions.Hosting.Timer/Motor.Extensions.Hosting.Timer.csproj +++ b/src/Motor.Extensions.Hosting.Timer/Motor.Extensions.Hosting.Timer.csproj @@ -1,16 +1,12 @@ - - net8.0;net9.0 - - - - - + + + + - diff --git a/src/Motor.Extensions.Hosting/Motor.Extensions.Hosting.csproj b/src/Motor.Extensions.Hosting/Motor.Extensions.Hosting.csproj index 2316d869e..b17d21f0b 100644 --- a/src/Motor.Extensions.Hosting/Motor.Extensions.Hosting.csproj +++ b/src/Motor.Extensions.Hosting/Motor.Extensions.Hosting.csproj @@ -1,7 +1,4 @@ - - net8.0;net9.0 - @@ -9,9 +6,8 @@ - - - + + + - diff --git a/src/Motor.Extensions.Http/Motor.Extensions.Http.csproj b/src/Motor.Extensions.Http/Motor.Extensions.Http.csproj index 573ffa5d2..c59184dd3 100644 --- a/src/Motor.Extensions.Http/Motor.Extensions.Http.csproj +++ b/src/Motor.Extensions.Http/Motor.Extensions.Http.csproj @@ -1,17 +1,13 @@ - - net8.0;net9.0 - - - - - - + + + + + - + - diff --git a/src/Motor.Extensions.TestUtilities/Motor.Extensions.TestUtilities.csproj b/src/Motor.Extensions.TestUtilities/Motor.Extensions.TestUtilities.csproj index b35c541c8..4961f060a 100644 --- a/src/Motor.Extensions.TestUtilities/Motor.Extensions.TestUtilities.csproj +++ b/src/Motor.Extensions.TestUtilities/Motor.Extensions.TestUtilities.csproj @@ -1,18 +1,16 @@ - net8.0;net9.0 false - - - - + + + + - diff --git a/src/Motor.Extensions.Utilities.Abstractions/Motor.Extensions.Utilities.Abstractions.csproj b/src/Motor.Extensions.Utilities.Abstractions/Motor.Extensions.Utilities.Abstractions.csproj index dc7947e9e..90fbca3b7 100644 --- a/src/Motor.Extensions.Utilities.Abstractions/Motor.Extensions.Utilities.Abstractions.csproj +++ b/src/Motor.Extensions.Utilities.Abstractions/Motor.Extensions.Utilities.Abstractions.csproj @@ -1,9 +1,5 @@ - - net8.0;net9.0 - - diff --git a/src/Motor.Extensions.Utilities/Motor.Extensions.Utilities.csproj b/src/Motor.Extensions.Utilities/Motor.Extensions.Utilities.csproj index 5efdec701..79a5b7a63 100644 --- a/src/Motor.Extensions.Utilities/Motor.Extensions.Utilities.csproj +++ b/src/Motor.Extensions.Utilities/Motor.Extensions.Utilities.csproj @@ -1,7 +1,4 @@ - - net8.0;net9.0 - @@ -16,5 +13,4 @@ - diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 000000000..b0d7fd34a --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,10 @@ + + + net8.0;net9.0; + 14 + enable + enable + false + true + + diff --git a/test/Motor.Extensions.ContentEncoding.Abstractions_UnitTest/Motor.Extensions.ContentEncoding.Abstractions_UnitTest.csproj b/test/Motor.Extensions.ContentEncoding.Abstractions_UnitTest/Motor.Extensions.ContentEncoding.Abstractions_UnitTest.csproj index bbfd35af6..8bc98d717 100644 --- a/test/Motor.Extensions.ContentEncoding.Abstractions_UnitTest/Motor.Extensions.ContentEncoding.Abstractions_UnitTest.csproj +++ b/test/Motor.Extensions.ContentEncoding.Abstractions_UnitTest/Motor.Extensions.ContentEncoding.Abstractions_UnitTest.csproj @@ -1,16 +1,12 @@ - - net8.0;net9.0 - false - - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Motor.Extensions.ContentEncoding.Gzip_UnitTest/Motor.Extensions.ContentEncoding.Gzip_UnitTest.csproj b/test/Motor.Extensions.ContentEncoding.Gzip_UnitTest/Motor.Extensions.ContentEncoding.Gzip_UnitTest.csproj index c7086a6cf..221f07962 100644 --- a/test/Motor.Extensions.ContentEncoding.Gzip_UnitTest/Motor.Extensions.ContentEncoding.Gzip_UnitTest.csproj +++ b/test/Motor.Extensions.ContentEncoding.Gzip_UnitTest/Motor.Extensions.ContentEncoding.Gzip_UnitTest.csproj @@ -1,12 +1,8 @@ - - net8.0;net9.0 - false - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Conversion.JsonNet_UnitTest/Motor.Extensions.Conversion.JsonNet_UnitTest.csproj b/test/Motor.Extensions.Conversion.JsonNet_UnitTest/Motor.Extensions.Conversion.JsonNet_UnitTest.csproj index f8bb42ef5..d424efd06 100644 --- a/test/Motor.Extensions.Conversion.JsonNet_UnitTest/Motor.Extensions.Conversion.JsonNet_UnitTest.csproj +++ b/test/Motor.Extensions.Conversion.JsonNet_UnitTest/Motor.Extensions.Conversion.JsonNet_UnitTest.csproj @@ -1,14 +1,10 @@ - - net8.0;net9.0 - false - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Conversion.Protobuf_UnitTest/Motor.Extensions.Conversion.Protobuf_UnitTest.csproj b/test/Motor.Extensions.Conversion.Protobuf_UnitTest/Motor.Extensions.Conversion.Protobuf_UnitTest.csproj index 7e3c172ca..54539a54d 100644 --- a/test/Motor.Extensions.Conversion.Protobuf_UnitTest/Motor.Extensions.Conversion.Protobuf_UnitTest.csproj +++ b/test/Motor.Extensions.Conversion.Protobuf_UnitTest/Motor.Extensions.Conversion.Protobuf_UnitTest.csproj @@ -1,20 +1,16 @@ - - net8.0;net9.0 - false - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/Motor.Extensions.Conversion.SystemJson_UnitTest/Motor.Extensions.Conversion.SystemJson_UnitTest.csproj b/test/Motor.Extensions.Conversion.SystemJson_UnitTest/Motor.Extensions.Conversion.SystemJson_UnitTest.csproj index 847eee1dd..d3e235f0e 100644 --- a/test/Motor.Extensions.Conversion.SystemJson_UnitTest/Motor.Extensions.Conversion.SystemJson_UnitTest.csproj +++ b/test/Motor.Extensions.Conversion.SystemJson_UnitTest/Motor.Extensions.Conversion.SystemJson_UnitTest.csproj @@ -1,14 +1,10 @@ - - net8.0;net9.0 - false - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Diagnostics.Metrics_UnitTest/Motor.Extensions.Diagnostics.Metrics_UnitTest.csproj b/test/Motor.Extensions.Diagnostics.Metrics_UnitTest/Motor.Extensions.Diagnostics.Metrics_UnitTest.csproj index 4927da232..5e21d5f48 100644 --- a/test/Motor.Extensions.Diagnostics.Metrics_UnitTest/Motor.Extensions.Diagnostics.Metrics_UnitTest.csproj +++ b/test/Motor.Extensions.Diagnostics.Metrics_UnitTest/Motor.Extensions.Diagnostics.Metrics_UnitTest.csproj @@ -1,13 +1,9 @@ - - net8.0;net9.0 - false - - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest.csproj b/test/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest.csproj index 900cbbe05..cd9492198 100644 --- a/test/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest.csproj +++ b/test/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest.csproj @@ -1,17 +1,11 @@ - - net8.0;net9.0 - enable - enable - false - - - - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest/ReverseStringConverter.cs b/test/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest/ReverseStringConverter.cs index f1f708340..bc85a43eb 100644 --- a/test/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest/ReverseStringConverter.cs +++ b/test/Motor.Extensions.Diagnostics.Telemetry_IntegrationTest/ReverseStringConverter.cs @@ -31,7 +31,7 @@ IMetricsFactory metricsFactory ) { _logger.LogInformation("log your request"); - var tmpChar = dataCloudEvent.TypedData.ToCharArray(); + var tmpChar = dataCloudEvent.TypedData.AsEnumerable(); if (!ActivitySource.HasListeners()) { throw new ArgumentException(); diff --git a/test/Motor.Extensions.Hosting.AspNet_IntegrationTest/Motor.Extensions.Hosting.AspNet_IntegrationTest.csproj b/test/Motor.Extensions.Hosting.AspNet_IntegrationTest/Motor.Extensions.Hosting.AspNet_IntegrationTest.csproj index 2f127aa90..1bc7809d9 100644 --- a/test/Motor.Extensions.Hosting.AspNet_IntegrationTest/Motor.Extensions.Hosting.AspNet_IntegrationTest.csproj +++ b/test/Motor.Extensions.Hosting.AspNet_IntegrationTest/Motor.Extensions.Hosting.AspNet_IntegrationTest.csproj @@ -1,15 +1,12 @@  - net8.0;net9.0 test - false Motor.NET - enable - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Hosting.BackgroundService_IntegrationTest/Motor.Extensions.Hosting.BackgroundService_IntegrationTest.csproj b/test/Motor.Extensions.Hosting.BackgroundService_IntegrationTest/Motor.Extensions.Hosting.BackgroundService_IntegrationTest.csproj index b61376483..991e8053d 100644 --- a/test/Motor.Extensions.Hosting.BackgroundService_IntegrationTest/Motor.Extensions.Hosting.BackgroundService_IntegrationTest.csproj +++ b/test/Motor.Extensions.Hosting.BackgroundService_IntegrationTest/Motor.Extensions.Hosting.BackgroundService_IntegrationTest.csproj @@ -1,14 +1,11 @@  - net8.0;net9.0 - false - enable Motor.NET Integration Test - - - + + + diff --git a/test/Motor.Extensions.Hosting.CloudEvents_UnitTest/Motor.Extensions.Hosting.CloudEvents_UnitTest.csproj b/test/Motor.Extensions.Hosting.CloudEvents_UnitTest/Motor.Extensions.Hosting.CloudEvents_UnitTest.csproj index 386f2b1e8..141ebd272 100644 --- a/test/Motor.Extensions.Hosting.CloudEvents_UnitTest/Motor.Extensions.Hosting.CloudEvents_UnitTest.csproj +++ b/test/Motor.Extensions.Hosting.CloudEvents_UnitTest/Motor.Extensions.Hosting.CloudEvents_UnitTest.csproj @@ -1,17 +1,13 @@ - - net8.0;net9.0 - false - - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Hosting.Consumer_UnitTest/Motor.Extensions.Hosting.Consumer_UnitTest.csproj b/test/Motor.Extensions.Hosting.Consumer_UnitTest/Motor.Extensions.Hosting.Consumer_UnitTest.csproj index 1964fcf38..f8d425f08 100644 --- a/test/Motor.Extensions.Hosting.Consumer_UnitTest/Motor.Extensions.Hosting.Consumer_UnitTest.csproj +++ b/test/Motor.Extensions.Hosting.Consumer_UnitTest/Motor.Extensions.Hosting.Consumer_UnitTest.csproj @@ -1,14 +1,9 @@ - - net8.0;net9.0 - false - enable - - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Hosting.Kafka_IntegrationTest/Motor.Extensions.Hosting.Kafka_IntegrationTest.csproj b/test/Motor.Extensions.Hosting.Kafka_IntegrationTest/Motor.Extensions.Hosting.Kafka_IntegrationTest.csproj index 7d1d2f1ab..70694fc3b 100644 --- a/test/Motor.Extensions.Hosting.Kafka_IntegrationTest/Motor.Extensions.Hosting.Kafka_IntegrationTest.csproj +++ b/test/Motor.Extensions.Hosting.Kafka_IntegrationTest/Motor.Extensions.Hosting.Kafka_IntegrationTest.csproj @@ -1,17 +1,13 @@ - - net8.0;net9.0 - false - - - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Hosting.Kafka_UnitTest/Motor.Extensions.Hosting.Kafka_UnitTest.csproj b/test/Motor.Extensions.Hosting.Kafka_UnitTest/Motor.Extensions.Hosting.Kafka_UnitTest.csproj index 7ff95a4e5..461870684 100644 --- a/test/Motor.Extensions.Hosting.Kafka_UnitTest/Motor.Extensions.Hosting.Kafka_UnitTest.csproj +++ b/test/Motor.Extensions.Hosting.Kafka_UnitTest/Motor.Extensions.Hosting.Kafka_UnitTest.csproj @@ -1,13 +1,9 @@ - - net8.0;net9.0 - false - - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Hosting.NATS_IntegrationTest/Motor.Extensions.Hosting.NATS_IntegrationTest.csproj b/test/Motor.Extensions.Hosting.NATS_IntegrationTest/Motor.Extensions.Hosting.NATS_IntegrationTest.csproj index 7d112101e..eea9c1810 100644 --- a/test/Motor.Extensions.Hosting.NATS_IntegrationTest/Motor.Extensions.Hosting.NATS_IntegrationTest.csproj +++ b/test/Motor.Extensions.Hosting.NATS_IntegrationTest/Motor.Extensions.Hosting.NATS_IntegrationTest.csproj @@ -1,20 +1,16 @@ - - net8.0;net9.0 - false - - - - - - - - + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Motor.Extensions.Hosting.Publisher_UnitTest/Motor.Extensions.Hosting.Publisher_UnitTest.csproj b/test/Motor.Extensions.Hosting.Publisher_UnitTest/Motor.Extensions.Hosting.Publisher_UnitTest.csproj index 7a9bfce87..8bdd259f3 100644 --- a/test/Motor.Extensions.Hosting.Publisher_UnitTest/Motor.Extensions.Hosting.Publisher_UnitTest.csproj +++ b/test/Motor.Extensions.Hosting.Publisher_UnitTest/Motor.Extensions.Hosting.Publisher_UnitTest.csproj @@ -1,14 +1,9 @@ - - net8.0;net9.0 - false - enable - - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Hosting.RabbitMQ_IntegrationTest/Motor.Extensions.Hosting.RabbitMQ_IntegrationTest.csproj b/test/Motor.Extensions.Hosting.RabbitMQ_IntegrationTest/Motor.Extensions.Hosting.RabbitMQ_IntegrationTest.csproj index 8b7dee3a7..ce4dd9496 100644 --- a/test/Motor.Extensions.Hosting.RabbitMQ_IntegrationTest/Motor.Extensions.Hosting.RabbitMQ_IntegrationTest.csproj +++ b/test/Motor.Extensions.Hosting.RabbitMQ_IntegrationTest/Motor.Extensions.Hosting.RabbitMQ_IntegrationTest.csproj @@ -1,31 +1,27 @@ - - net8.0;net9.0 - false - - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + - + diff --git a/test/Motor.Extensions.Hosting.RabbitMQ_UnitTest/Motor.Extensions.Hosting.RabbitMQ_UnitTest.csproj b/test/Motor.Extensions.Hosting.RabbitMQ_UnitTest/Motor.Extensions.Hosting.RabbitMQ_UnitTest.csproj index cb15abdfb..9c6c6179c 100644 --- a/test/Motor.Extensions.Hosting.RabbitMQ_UnitTest/Motor.Extensions.Hosting.RabbitMQ_UnitTest.csproj +++ b/test/Motor.Extensions.Hosting.RabbitMQ_UnitTest/Motor.Extensions.Hosting.RabbitMQ_UnitTest.csproj @@ -1,17 +1,12 @@ - - net8.0;net9.0 - false - enable - - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/Motor.Extensions.Hosting.RabbitMQ_UnitTest/RabbitMQMessageHostBuilderExtensionsTests.cs b/test/Motor.Extensions.Hosting.RabbitMQ_UnitTest/RabbitMQMessageHostBuilderExtensionsTests.cs index f4e47ef7a..186d2ec91 100644 --- a/test/Motor.Extensions.Hosting.RabbitMQ_UnitTest/RabbitMQMessageHostBuilderExtensionsTests.cs +++ b/test/Motor.Extensions.Hosting.RabbitMQ_UnitTest/RabbitMQMessageHostBuilderExtensionsTests.cs @@ -35,6 +35,15 @@ private static IMotorHostBuilder GetHostBuilder() mock.Setup(t => t.GetSource()).Returns(new Uri("motor://test")); return mock.Object; }); + services.AddTransient(_ => + { + var mock = new Mock>(); + + return mock.Object; + }); + services.AddTransient>(_ => + new Mock>().Object + ); } ); } diff --git a/test/Motor.Extensions.Hosting.SQS_IntegrationTest/Motor.Extensions.Hosting.SQS_IntegrationTest.csproj b/test/Motor.Extensions.Hosting.SQS_IntegrationTest/Motor.Extensions.Hosting.SQS_IntegrationTest.csproj index 4480d818c..4912f959f 100644 --- a/test/Motor.Extensions.Hosting.SQS_IntegrationTest/Motor.Extensions.Hosting.SQS_IntegrationTest.csproj +++ b/test/Motor.Extensions.Hosting.SQS_IntegrationTest/Motor.Extensions.Hosting.SQS_IntegrationTest.csproj @@ -1,21 +1,19 @@ - net8.0;net9.0 - false Motor.Extensions.Hosting.SQS_IntegrationTest - - - - - - - + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Motor.Extensions.Hosting.Timer_IntegrationTest/Motor.Extensions.Hosting.Timer_IntegrationTest.csproj b/test/Motor.Extensions.Hosting.Timer_IntegrationTest/Motor.Extensions.Hosting.Timer_IntegrationTest.csproj index 8d86e7fd0..357de9702 100644 --- a/test/Motor.Extensions.Hosting.Timer_IntegrationTest/Motor.Extensions.Hosting.Timer_IntegrationTest.csproj +++ b/test/Motor.Extensions.Hosting.Timer_IntegrationTest/Motor.Extensions.Hosting.Timer_IntegrationTest.csproj @@ -1,17 +1,14 @@ - - net8.0;net9.0 - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/Motor.Extensions.Hosting_IntegrationTest/GenericHostingTests.cs b/test/Motor.Extensions.Hosting_IntegrationTest/GenericHostingTests.cs index 3f50f9ed9..eb05c4c83 100644 --- a/test/Motor.Extensions.Hosting_IntegrationTest/GenericHostingTests.cs +++ b/test/Motor.Extensions.Hosting_IntegrationTest/GenericHostingTests.cs @@ -233,7 +233,7 @@ IMetricsFactory metricsFactory ) { _logger.LogInformation("log your request"); - var tmpChar = dataCloudEvent.TypedData.ToCharArray(); + var tmpChar = dataCloudEvent.TypedData.AsEnumerable(); if (!ActivitySource.HasListeners()) { throw new ArgumentException(); diff --git a/test/Motor.Extensions.Hosting_IntegrationTest/Motor.Extensions.Hosting_IntegrationTest.csproj b/test/Motor.Extensions.Hosting_IntegrationTest/Motor.Extensions.Hosting_IntegrationTest.csproj index f309e9c16..2bf8c5fca 100644 --- a/test/Motor.Extensions.Hosting_IntegrationTest/Motor.Extensions.Hosting_IntegrationTest.csproj +++ b/test/Motor.Extensions.Hosting_IntegrationTest/Motor.Extensions.Hosting_IntegrationTest.csproj @@ -1,21 +1,16 @@ - - net8.0;net9.0 - false - enable - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/test/Motor.Extensions.Hosting_UnitTest/Motor.Extensions.Hosting_UnitTest.csproj b/test/Motor.Extensions.Hosting_UnitTest/Motor.Extensions.Hosting_UnitTest.csproj index 37e67cddb..a88c741dd 100644 --- a/test/Motor.Extensions.Hosting_UnitTest/Motor.Extensions.Hosting_UnitTest.csproj +++ b/test/Motor.Extensions.Hosting_UnitTest/Motor.Extensions.Hosting_UnitTest.csproj @@ -1,15 +1,12 @@ - net8.0;net9.0 - false - enable Test - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Http_UnitTest/Motor.Extensions.Http_UnitTest.csproj b/test/Motor.Extensions.Http_UnitTest/Motor.Extensions.Http_UnitTest.csproj index 0e17e0ae4..6bb79aa85 100644 --- a/test/Motor.Extensions.Http_UnitTest/Motor.Extensions.Http_UnitTest.csproj +++ b/test/Motor.Extensions.Http_UnitTest/Motor.Extensions.Http_UnitTest.csproj @@ -1,15 +1,11 @@ - - net8.0;net9.0 - false - - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Motor.Extensions.Utilities_IntegrationTest/DemonstrationTests.cs b/test/Motor.Extensions.Utilities_IntegrationTest/DemonstrationTests.cs index 6223809df..ed9777e9e 100644 --- a/test/Motor.Extensions.Utilities_IntegrationTest/DemonstrationTests.cs +++ b/test/Motor.Extensions.Utilities_IntegrationTest/DemonstrationTests.cs @@ -117,7 +117,7 @@ IMetricsFactory metricsFactory var parentContext = dataCloudEvent.GetActivityContext(); Assert.NotEqual(default, parentContext); _logger.LogInformation("log your request"); - var tmpChar = dataCloudEvent.TypedData.ToCharArray(); + var tmpChar = dataCloudEvent.TypedData.AsEnumerable(); var reversed = tmpChar.Reverse().ToArray(); _summary.WithLabels("collect_your_metrics").Observe(1.0); return Task.FromResult?>(dataCloudEvent.CreateNew(new string(reversed))); diff --git a/test/Motor.Extensions.Utilities_IntegrationTest/Motor.Extensions.Utilities_IntegrationTest.csproj b/test/Motor.Extensions.Utilities_IntegrationTest/Motor.Extensions.Utilities_IntegrationTest.csproj index e5f5dd6ea..809c673ba 100644 --- a/test/Motor.Extensions.Utilities_IntegrationTest/Motor.Extensions.Utilities_IntegrationTest.csproj +++ b/test/Motor.Extensions.Utilities_IntegrationTest/Motor.Extensions.Utilities_IntegrationTest.csproj @@ -1,16 +1,13 @@ - net8.0;net9.0 test - false Motor.NET - enable - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive