diff --git a/Directory.Packages.props b/Directory.Packages.props index 754f244e5..207190988 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,7 +3,7 @@ true - + @@ -27,10 +27,10 @@ - + - + @@ -51,17 +51,17 @@ - - + + - + - - - - + + + + @@ -85,27 +85,28 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/applications/tests/Evaluation.Tests/Evaluation.FunctionalTests.csproj b/applications/tests/Evaluation.Tests/Evaluation.FunctionalTests.csproj index a22a22b4a..563fff83a 100644 --- a/applications/tests/Evaluation.Tests/Evaluation.FunctionalTests.csproj +++ b/applications/tests/Evaluation.Tests/Evaluation.FunctionalTests.csproj @@ -19,12 +19,16 @@ - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/applications/tests/Evaluation.Tests/TestsetGenerationTests.cs b/applications/tests/Evaluation.Tests/TestsetGenerationTests.cs index 83d1e8bcc..59526771e 100644 --- a/applications/tests/Evaluation.Tests/TestsetGenerationTests.cs +++ b/applications/tests/Evaluation.Tests/TestsetGenerationTests.cs @@ -4,7 +4,6 @@ using Microsoft.KernelMemory.Evaluation; using Microsoft.KernelMemory.Evaluation.TestSet; using Microsoft.SemanticKernel; -using Xunit.Abstractions; namespace Microsoft.KM.Evaluation.FunctionalTests; @@ -62,10 +61,12 @@ await this._memory .ImportDocumentAsync( "file1-NASA-news.pdf", documentId: "file1-NASA-news", - steps: Constants.PipelineWithoutSummary); + steps: Constants.PipelineWithoutSummary) + .ConfigureAwait(false); var testSets = await this._testSetGenerator.GenerateTestSetsAsync("default4tests", retryCount: 5, count: 1) - .ToArrayAsync(); + .ToArrayAsync() + .ConfigureAwait(false); Assert.NotEmpty(testSets); Assert.Equal(1, testSets.Length); @@ -79,15 +80,18 @@ await this._memory .ImportDocumentAsync( "file1-NASA-news.pdf", documentId: "file1-NASA-news", - steps: Constants.PipelineWithoutSummary); + steps: Constants.PipelineWithoutSummary) + .ConfigureAwait(false); var evaluation = await this._testSetEvaluator.EvaluateTestSetAsync("default4tests", [ - new TestSetItem - { - Question = "What is the role of the Department of Defense in the recovery operations for the Artemis II mission?", - GroundTruth = "The Department of Defense personnel are involved in practicing recovery operations for the Artemis II mission. They use a crew module test article to help verify the recovery team's readiness to recover the Artemis II crew and the Orion spacecraft.", - } - ]).ToArrayAsync(); + new TestSetItem + { + Question = "What is the role of the Department of Defense in the recovery operations for the Artemis II mission?", + GroundTruth = "The Department of Defense personnel are involved in practicing recovery operations for the Artemis II mission. They use a crew module test article to help verify the recovery team's readiness to recover the Artemis II crew and the Orion spacecraft.", + } + ]) + .ToArrayAsync() + .ConfigureAwait(false); Assert.NotEmpty(evaluation); } diff --git a/extensions/AzureAISearch/AzureAISearch.FunctionalTests/AzureAISearch.FunctionalTests.csproj b/extensions/AzureAISearch/AzureAISearch.FunctionalTests/AzureAISearch.FunctionalTests.csproj index e1f389c0c..a4fa16cc9 100644 --- a/extensions/AzureAISearch/AzureAISearch.FunctionalTests/AzureAISearch.FunctionalTests.csproj +++ b/extensions/AzureAISearch/AzureAISearch.FunctionalTests/AzureAISearch.FunctionalTests.csproj @@ -18,10 +18,13 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/AzureAISearch/AzureAISearch.FunctionalTests/DefaultTests.cs b/extensions/AzureAISearch/AzureAISearch.FunctionalTests/DefaultTests.cs index 3977ceb6d..6c09828ed 100644 --- a/extensions/AzureAISearch/AzureAISearch.FunctionalTests/DefaultTests.cs +++ b/extensions/AzureAISearch/AzureAISearch.FunctionalTests/DefaultTests.cs @@ -3,7 +3,6 @@ using Microsoft.KernelMemory; using Microsoft.KM.Core.FunctionalTests.DefaultTestCases; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.AzureAISearch.FunctionalTests; diff --git a/extensions/AzureAISearch/AzureAISearch.UnitTests/AzureAISearch.UnitTests.csproj b/extensions/AzureAISearch/AzureAISearch.UnitTests/AzureAISearch.UnitTests.csproj index 87ee69266..be9b85e5d 100644 --- a/extensions/AzureAISearch/AzureAISearch.UnitTests/AzureAISearch.UnitTests.csproj +++ b/extensions/AzureAISearch/AzureAISearch.UnitTests/AzureAISearch.UnitTests.csproj @@ -17,10 +17,15 @@ - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - runtime; build; native; contentfiles; analyzers; buildtransitive all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/AzureAISearch/AzureAISearch.UnitTests/AzureAISearchFilteringTest.cs b/extensions/AzureAISearch/AzureAISearch.UnitTests/AzureAISearchFilteringTest.cs index c6b7789da..2e9b48156 100644 --- a/extensions/AzureAISearch/AzureAISearch.UnitTests/AzureAISearchFilteringTest.cs +++ b/extensions/AzureAISearch/AzureAISearch.UnitTests/AzureAISearchFilteringTest.cs @@ -3,7 +3,6 @@ using Microsoft.KernelMemory; using Microsoft.KernelMemory.MemoryDb.AzureAISearch; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.AzureAISearch.UnitTests; diff --git a/extensions/AzureOpenAI/AzureOpenAI.FunctionalTests/AzureOpenAI.FunctionalTests.csproj b/extensions/AzureOpenAI/AzureOpenAI.FunctionalTests/AzureOpenAI.FunctionalTests.csproj index 3f17302b5..7580db570 100644 --- a/extensions/AzureOpenAI/AzureOpenAI.FunctionalTests/AzureOpenAI.FunctionalTests.csproj +++ b/extensions/AzureOpenAI/AzureOpenAI.FunctionalTests/AzureOpenAI.FunctionalTests.csproj @@ -19,10 +19,12 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/AzureOpenAI/AzureOpenAI.FunctionalTests/Issue855Test.cs b/extensions/AzureOpenAI/AzureOpenAI.FunctionalTests/Issue855Test.cs index e0740d134..878bf57bb 100644 --- a/extensions/AzureOpenAI/AzureOpenAI.FunctionalTests/Issue855Test.cs +++ b/extensions/AzureOpenAI/AzureOpenAI.FunctionalTests/Issue855Test.cs @@ -3,7 +3,6 @@ using Microsoft.KernelMemory.AI.AzureOpenAI; using Microsoft.KM.TestHelpers; using Xunit; -using Xunit.Abstractions; namespace Microsoft.AzureOpenAI.FunctionalTests; diff --git a/extensions/Chunkers/Chunkers.UnitTests/Chunkers.UnitTests.csproj b/extensions/Chunkers/Chunkers.UnitTests/Chunkers.UnitTests.csproj index f72f7ccb4..a12103fa9 100644 --- a/extensions/Chunkers/Chunkers.UnitTests/Chunkers.UnitTests.csproj +++ b/extensions/Chunkers/Chunkers.UnitTests/Chunkers.UnitTests.csproj @@ -17,8 +17,10 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/Chunkers/Chunkers.UnitTests/MarkDownChunkerManualTest.cs b/extensions/Chunkers/Chunkers.UnitTests/MarkDownChunkerManualTest.cs index c184dcbe0..f8ed46c63 100644 --- a/extensions/Chunkers/Chunkers.UnitTests/MarkDownChunkerManualTest.cs +++ b/extensions/Chunkers/Chunkers.UnitTests/MarkDownChunkerManualTest.cs @@ -5,7 +5,6 @@ using Microsoft.KernelMemory.Chunkers; using Microsoft.KM.TestHelpers; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Chunkers.UnitTests; diff --git a/extensions/Chunkers/Chunkers.UnitTests/MarkDownChunkerTests.cs b/extensions/Chunkers/Chunkers.UnitTests/MarkDownChunkerTests.cs index b354f2920..01d337184 100644 --- a/extensions/Chunkers/Chunkers.UnitTests/MarkDownChunkerTests.cs +++ b/extensions/Chunkers/Chunkers.UnitTests/MarkDownChunkerTests.cs @@ -6,7 +6,6 @@ using Microsoft.KernelMemory.DataFormats; using Microsoft.KM.TestHelpers; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Chunkers.UnitTests; diff --git a/extensions/Chunkers/Chunkers.UnitTests/PlainTextChunkerPerfTest.cs b/extensions/Chunkers/Chunkers.UnitTests/PlainTextChunkerPerfTest.cs index 8a2dbbd75..6106c261d 100644 --- a/extensions/Chunkers/Chunkers.UnitTests/PlainTextChunkerPerfTest.cs +++ b/extensions/Chunkers/Chunkers.UnitTests/PlainTextChunkerPerfTest.cs @@ -5,7 +5,6 @@ using Microsoft.KernelMemory.Chunkers; using Microsoft.KM.TestHelpers; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Chunkers.UnitTests; diff --git a/extensions/Chunkers/Chunkers.UnitTests/PlainTextChunkerTest.cs b/extensions/Chunkers/Chunkers.UnitTests/PlainTextChunkerTest.cs index b9e515e69..2de4962ef 100644 --- a/extensions/Chunkers/Chunkers.UnitTests/PlainTextChunkerTest.cs +++ b/extensions/Chunkers/Chunkers.UnitTests/PlainTextChunkerTest.cs @@ -7,7 +7,6 @@ using Microsoft.KernelMemory.DataFormats; using Microsoft.KM.TestHelpers; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Chunkers.UnitTests; diff --git a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/DataStorageTests.cs b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/DataStorageTests.cs index b0bf01a81..03c9da46e 100644 --- a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/DataStorageTests.cs +++ b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/DataStorageTests.cs @@ -7,7 +7,6 @@ using Microsoft.KernelMemory.MemoryDb.Elasticsearch.Internals; using Microsoft.KernelMemory.MemoryStorage; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Elasticsearch.FunctionalTests.Additional; diff --git a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/IndexManagementTests.cs b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/IndexManagementTests.cs index bd6bde095..20a44b41f 100644 --- a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/IndexManagementTests.cs +++ b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/IndexManagementTests.cs @@ -2,7 +2,6 @@ using Microsoft.KernelMemory.MemoryDb.Elasticsearch.Internals; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Elasticsearch.FunctionalTests.Additional; diff --git a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/IndexNameTests.cs b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/IndexNameTests.cs index ff4e97e49..523ee9bb1 100644 --- a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/IndexNameTests.cs +++ b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/IndexNameTests.cs @@ -4,7 +4,6 @@ using Microsoft.KernelMemory.MemoryDb.Elasticsearch.Internals; using Microsoft.KM.TestHelpers; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Elasticsearch.FunctionalTests.Additional; diff --git a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/KernelMemoryTests.cs b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/KernelMemoryTests.cs index f77793350..64ea8ab70 100644 --- a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/KernelMemoryTests.cs +++ b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/KernelMemoryTests.cs @@ -4,7 +4,6 @@ using Microsoft.KernelMemory; using Microsoft.KernelMemory.MemoryDb.Elasticsearch.Internals; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Elasticsearch.FunctionalTests.Additional; diff --git a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/MemoryDbFunctionalTest.cs b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/MemoryDbFunctionalTest.cs index ceede208e..346c524c1 100644 --- a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/MemoryDbFunctionalTest.cs +++ b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/MemoryDbFunctionalTest.cs @@ -8,7 +8,6 @@ using Microsoft.KernelMemory.MemoryStorage; using Microsoft.KM.TestHelpers; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Elasticsearch.FunctionalTests.Additional; @@ -18,6 +17,7 @@ namespace Microsoft.Elasticsearch.FunctionalTests.Additional; /// deleted before and after the tests. This ensures that Elasticsearch is left in a clean state /// or that subsequent tests don't fail because of left-over indices. /// +#pragma warning disable CA1033 public abstract class MemoryDbFunctionalTest : BaseFunctionalTestCase, IAsyncLifetime { protected MemoryDbFunctionalTest(IConfiguration cfg, ITestOutputHelper output) @@ -41,7 +41,7 @@ protected MemoryDbFunctionalTest(IConfiguration cfg, ITestOutputHelper output) public IMemoryDb MemoryDb { get; } public ITextEmbeddingGenerator TextEmbeddingGenerator { get; } - public async Task InitializeAsync() + async ValueTask IAsyncLifetime.InitializeAsync() { // Within a single test class, the tests are executed sequentially by default so // there is no chance for a method to finish and delete indices of other methods before the next @@ -56,7 +56,7 @@ public async Task InitializeAsync() } } - public async Task DisposeAsync() + public async ValueTask DisposeAsync() { var indicesFound = await this.Client.DeleteIndicesOfTestAsync(this.GetType(), base.ElasticsearchConfig).ConfigureAwait(false); @@ -65,5 +65,7 @@ public async Task DisposeAsync() this.Output.WriteLine($"Deleted test indices: {string.Join(", ", indicesFound)}"); this.Output.WriteLine(""); } + + GC.SuppressFinalize(this); } } diff --git a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/SearchTests.cs b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/SearchTests.cs index 2be5df621..71a445a2f 100644 --- a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/SearchTests.cs +++ b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Additional/SearchTests.cs @@ -3,7 +3,6 @@ using Microsoft.KernelMemory; using Microsoft.KernelMemory.MemoryDb.Elasticsearch.Internals; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Elasticsearch.FunctionalTests.Additional; diff --git a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/DefaultTests.cs b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/DefaultTests.cs index 3bb9fd093..8a689958c 100644 --- a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/DefaultTests.cs +++ b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/DefaultTests.cs @@ -4,7 +4,6 @@ using Microsoft.KM.Core.FunctionalTests.DefaultTestCases; using Microsoft.KM.TestHelpers; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Elasticsearch.FunctionalTests; diff --git a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Elasticsearch.FunctionalTests.csproj b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Elasticsearch.FunctionalTests.csproj index 1ee08ff8c..10c309c54 100644 --- a/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Elasticsearch.FunctionalTests.csproj +++ b/extensions/Elasticsearch/Elasticsearch.FunctionalTests/Elasticsearch.FunctionalTests.csproj @@ -18,12 +18,15 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharp.FunctionalTests.csproj b/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharp.FunctionalTests.csproj index c9d224b85..242b3f86c 100644 --- a/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharp.FunctionalTests.csproj +++ b/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharp.FunctionalTests.csproj @@ -22,8 +22,10 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTextEmbeddingGeneratorTest.cs b/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTextEmbeddingGeneratorTest.cs index 922b4b498..9cc97a623 100644 --- a/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTextEmbeddingGeneratorTest.cs +++ b/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTextEmbeddingGeneratorTest.cs @@ -3,7 +3,6 @@ using Microsoft.KernelMemory; using Microsoft.KernelMemory.AI.LlamaSharp; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.LlamaSharp.FunctionalTests; diff --git a/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTextGeneratorTest.cs b/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTextGeneratorTest.cs index 55796dd52..965f23fcd 100644 --- a/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTextGeneratorTest.cs +++ b/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTextGeneratorTest.cs @@ -5,7 +5,6 @@ using Microsoft.KernelMemory.AI; using Microsoft.KernelMemory.AI.LlamaSharp; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.LlamaSharp.FunctionalTests; diff --git a/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTokenizerTest.cs b/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTokenizerTest.cs index 50e1c2276..2c641abc2 100644 --- a/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTokenizerTest.cs +++ b/extensions/LlamaSharp/LlamaSharp.FunctionalTests/LlamaSharpTokenizerTest.cs @@ -4,7 +4,6 @@ using LLama.Common; using Microsoft.KernelMemory.AI.LlamaSharp; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.LlamaSharp.FunctionalTests; diff --git a/extensions/LlamaSharp/LlamaSharp/LlamaSharpTextGenerator.cs b/extensions/LlamaSharp/LlamaSharp/LlamaSharpTextGenerator.cs index 278ab4e39..949df694a 100644 --- a/extensions/LlamaSharp/LlamaSharp/LlamaSharpTextGenerator.cs +++ b/extensions/LlamaSharp/LlamaSharp/LlamaSharpTextGenerator.cs @@ -89,8 +89,8 @@ public IAsyncEnumerable GenerateTextAsync( { Temperature = (float)options.Temperature, TopP = (float)options.NucleusSampling, - AlphaPresence = (float)options.PresencePenalty, - AlphaFrequency = (float)options.FrequencyPenalty, + PresencePenalty = (float)options.PresencePenalty, + FrequencyPenalty = (float)options.FrequencyPenalty, LogitBias = logitBias, }; diff --git a/extensions/MongoDbAtlas/MongoDbAtlas.FunctionalTests/MongoDbAtlas.FunctionalTests.csproj b/extensions/MongoDbAtlas/MongoDbAtlas.FunctionalTests/MongoDbAtlas.FunctionalTests.csproj index 1eac1cf62..2434690d6 100644 --- a/extensions/MongoDbAtlas/MongoDbAtlas.FunctionalTests/MongoDbAtlas.FunctionalTests.csproj +++ b/extensions/MongoDbAtlas/MongoDbAtlas.FunctionalTests/MongoDbAtlas.FunctionalTests.csproj @@ -19,12 +19,15 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/MongoDbAtlas/MongoDbAtlas.FunctionalTests/Usings.cs b/extensions/MongoDbAtlas/MongoDbAtlas.FunctionalTests/Usings.cs index 418559e29..b68dfd0e8 100644 --- a/extensions/MongoDbAtlas/MongoDbAtlas.FunctionalTests/Usings.cs +++ b/extensions/MongoDbAtlas/MongoDbAtlas.FunctionalTests/Usings.cs @@ -1,4 +1,4 @@ // Copyright (c) Microsoft. All rights reserved. global using Xunit; -global using Xunit.Abstractions; + diff --git a/extensions/MongoDbAtlas/MongoDbAtlas/MongoDbAtlas.csproj b/extensions/MongoDbAtlas/MongoDbAtlas/MongoDbAtlas.csproj index ddb42ee76..45f42f5e7 100644 --- a/extensions/MongoDbAtlas/MongoDbAtlas/MongoDbAtlas.csproj +++ b/extensions/MongoDbAtlas/MongoDbAtlas/MongoDbAtlas.csproj @@ -13,7 +13,7 @@ - + diff --git a/extensions/ONNX/Onnx.FunctionalTests/Onnx.FunctionalTests.csproj b/extensions/ONNX/Onnx.FunctionalTests/Onnx.FunctionalTests.csproj index 8a4ca3a13..6f4f05ca7 100644 --- a/extensions/ONNX/Onnx.FunctionalTests/Onnx.FunctionalTests.csproj +++ b/extensions/ONNX/Onnx.FunctionalTests/Onnx.FunctionalTests.csproj @@ -21,8 +21,10 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/ONNX/Onnx.FunctionalTests/OnnxTextGeneratorTest.cs b/extensions/ONNX/Onnx.FunctionalTests/OnnxTextGeneratorTest.cs index acf38fda9..a09010064 100644 --- a/extensions/ONNX/Onnx.FunctionalTests/OnnxTextGeneratorTest.cs +++ b/extensions/ONNX/Onnx.FunctionalTests/OnnxTextGeneratorTest.cs @@ -5,7 +5,6 @@ using Microsoft.KernelMemory.AI; using Microsoft.KernelMemory.AI.Onnx; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.Onnx.FunctionalTests; diff --git a/extensions/Postgres/Postgres.FunctionalTests/Postgres.FunctionalTests.csproj b/extensions/Postgres/Postgres.FunctionalTests/Postgres.FunctionalTests.csproj index 660069432..d75dec261 100644 --- a/extensions/Postgres/Postgres.FunctionalTests/Postgres.FunctionalTests.csproj +++ b/extensions/Postgres/Postgres.FunctionalTests/Postgres.FunctionalTests.csproj @@ -18,12 +18,15 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/Postgres/Postgres.FunctionalTests/Usings.cs b/extensions/Postgres/Postgres.FunctionalTests/Usings.cs index e1e8de418..c20621e9b 100644 --- a/extensions/Postgres/Postgres.FunctionalTests/Usings.cs +++ b/extensions/Postgres/Postgres.FunctionalTests/Usings.cs @@ -1,5 +1,4 @@ // Copyright (c) Microsoft. All rights reserved. global using Xunit; -global using Xunit.Abstractions; global using Microsoft.KernelMemory.Postgres; diff --git a/extensions/Postgres/Postgres.UnitTests/Postgres.UnitTests.csproj b/extensions/Postgres/Postgres.UnitTests/Postgres.UnitTests.csproj index 2a045546c..e47d3a329 100644 --- a/extensions/Postgres/Postgres.UnitTests/Postgres.UnitTests.csproj +++ b/extensions/Postgres/Postgres.UnitTests/Postgres.UnitTests.csproj @@ -17,10 +17,16 @@ - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/Qdrant/Qdrant.FunctionalTests/DefaultTests.cs b/extensions/Qdrant/Qdrant.FunctionalTests/DefaultTests.cs index f16ed4345..10b28f62f 100644 --- a/extensions/Qdrant/Qdrant.FunctionalTests/DefaultTests.cs +++ b/extensions/Qdrant/Qdrant.FunctionalTests/DefaultTests.cs @@ -3,7 +3,6 @@ using Microsoft.KernelMemory; using Microsoft.KM.Core.FunctionalTests.DefaultTestCases; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.Qdrant.FunctionalTests; diff --git a/extensions/Qdrant/Qdrant.FunctionalTests/Qdrant.FunctionalTests.csproj b/extensions/Qdrant/Qdrant.FunctionalTests/Qdrant.FunctionalTests.csproj index d2c86c0ed..86e810224 100644 --- a/extensions/Qdrant/Qdrant.FunctionalTests/Qdrant.FunctionalTests.csproj +++ b/extensions/Qdrant/Qdrant.FunctionalTests/Qdrant.FunctionalTests.csproj @@ -18,10 +18,12 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/Qdrant/Qdrant.UnitTests/FilteringTest.cs b/extensions/Qdrant/Qdrant.UnitTests/FilteringTest.cs index 20ebe3b5d..36a359333 100644 --- a/extensions/Qdrant/Qdrant.UnitTests/FilteringTest.cs +++ b/extensions/Qdrant/Qdrant.UnitTests/FilteringTest.cs @@ -3,7 +3,6 @@ using System.Text.Json; using Microsoft.KernelMemory.MemoryDb.Qdrant.Client.Http; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.Qdrant.UnitTests; diff --git a/extensions/Qdrant/Qdrant.UnitTests/Qdrant.UnitTests.csproj b/extensions/Qdrant/Qdrant.UnitTests/Qdrant.UnitTests.csproj index 3bf2d12be..71fb43ce8 100644 --- a/extensions/Qdrant/Qdrant.UnitTests/Qdrant.UnitTests.csproj +++ b/extensions/Qdrant/Qdrant.UnitTests/Qdrant.UnitTests.csproj @@ -20,8 +20,10 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/Qdrant/Qdrant.UnitTests/ScrollVectorsRequestTest.cs b/extensions/Qdrant/Qdrant.UnitTests/ScrollVectorsRequestTest.cs index 9b3dccfc5..59b370169 100644 --- a/extensions/Qdrant/Qdrant.UnitTests/ScrollVectorsRequestTest.cs +++ b/extensions/Qdrant/Qdrant.UnitTests/ScrollVectorsRequestTest.cs @@ -3,7 +3,6 @@ using System.Text.Json; using Microsoft.KernelMemory.MemoryDb.Qdrant.Client.Http; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.Qdrant.UnitTests; diff --git a/extensions/Redis/Redis.FunctionalTests/AdditionalFilteringTests.cs b/extensions/Redis/Redis.FunctionalTests/AdditionalFilteringTests.cs index 3418928a7..f130b2f06 100644 --- a/extensions/Redis/Redis.FunctionalTests/AdditionalFilteringTests.cs +++ b/extensions/Redis/Redis.FunctionalTests/AdditionalFilteringTests.cs @@ -4,7 +4,6 @@ using Microsoft.KernelMemory.DocumentStorage.DevTools; using Microsoft.KernelMemory.FileSystem.DevTools; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.Redis.FunctionalTests; diff --git a/extensions/Redis/Redis.FunctionalTests/DefaultTests.cs b/extensions/Redis/Redis.FunctionalTests/DefaultTests.cs index f6bdc004b..9c2acd88a 100644 --- a/extensions/Redis/Redis.FunctionalTests/DefaultTests.cs +++ b/extensions/Redis/Redis.FunctionalTests/DefaultTests.cs @@ -3,7 +3,6 @@ using Microsoft.KernelMemory; using Microsoft.KM.Core.FunctionalTests.DefaultTestCases; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.Redis.FunctionalTests; diff --git a/extensions/Redis/Redis.FunctionalTests/Redis.FunctionalTests.csproj b/extensions/Redis/Redis.FunctionalTests/Redis.FunctionalTests.csproj index 9c2888777..fcad0803b 100644 --- a/extensions/Redis/Redis.FunctionalTests/Redis.FunctionalTests.csproj +++ b/extensions/Redis/Redis.FunctionalTests/Redis.FunctionalTests.csproj @@ -18,12 +18,15 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/Redis/Redis.FunctionalTests/RedisSpecificTests.cs b/extensions/Redis/Redis.FunctionalTests/RedisSpecificTests.cs index 09dc3b645..cbb2ad43d 100644 --- a/extensions/Redis/Redis.FunctionalTests/RedisSpecificTests.cs +++ b/extensions/Redis/Redis.FunctionalTests/RedisSpecificTests.cs @@ -2,7 +2,6 @@ using Microsoft.KernelMemory; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.Redis.FunctionalTests; diff --git a/extensions/SQLServer/SQLServer.FunctionalTests/SQLServer.FunctionalTests.csproj b/extensions/SQLServer/SQLServer.FunctionalTests/SQLServer.FunctionalTests.csproj index d979a9b77..a74411aa7 100644 --- a/extensions/SQLServer/SQLServer.FunctionalTests/SQLServer.FunctionalTests.csproj +++ b/extensions/SQLServer/SQLServer.FunctionalTests/SQLServer.FunctionalTests.csproj @@ -17,12 +17,15 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/SQLServer/SQLServer.FunctionalTests/Usings.cs b/extensions/SQLServer/SQLServer.FunctionalTests/Usings.cs index 1bb8f0928..e0795a77c 100644 --- a/extensions/SQLServer/SQLServer.FunctionalTests/Usings.cs +++ b/extensions/SQLServer/SQLServer.FunctionalTests/Usings.cs @@ -1,4 +1,4 @@ // Copyright (c) Microsoft. All rights reserved. global using Xunit; -global using Xunit.Abstractions; + diff --git a/extensions/Tiktoken/Tiktoken.UnitTests/Tiktoken.UnitTests.csproj b/extensions/Tiktoken/Tiktoken.UnitTests/Tiktoken.UnitTests.csproj index d3f92c4ef..83b34b614 100644 --- a/extensions/Tiktoken/Tiktoken.UnitTests/Tiktoken.UnitTests.csproj +++ b/extensions/Tiktoken/Tiktoken.UnitTests/Tiktoken.UnitTests.csproj @@ -21,8 +21,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/extensions/Tiktoken/Tiktoken.UnitTests/TokenizersTests.cs b/extensions/Tiktoken/Tiktoken.UnitTests/TokenizersTests.cs index 270e4ba63..95741f392 100644 --- a/extensions/Tiktoken/Tiktoken.UnitTests/TokenizersTests.cs +++ b/extensions/Tiktoken/Tiktoken.UnitTests/TokenizersTests.cs @@ -3,7 +3,6 @@ using Microsoft.KernelMemory.AI; using Microsoft.KM.TestHelpers; using Xunit; -using Xunit.Abstractions; namespace Microsoft.Tiktoken.UnitTests; diff --git a/service/tests/Abstractions.UnitTests/Abstractions.UnitTests.csproj b/service/tests/Abstractions.UnitTests/Abstractions.UnitTests.csproj index 64eb50373..d115c7469 100644 --- a/service/tests/Abstractions.UnitTests/Abstractions.UnitTests.csproj +++ b/service/tests/Abstractions.UnitTests/Abstractions.UnitTests.csproj @@ -24,8 +24,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/service/tests/Core.FunctionalTests/Core.FunctionalTests.csproj b/service/tests/Core.FunctionalTests/Core.FunctionalTests.csproj index 2fac58491..880e12d9b 100644 --- a/service/tests/Core.FunctionalTests/Core.FunctionalTests.csproj +++ b/service/tests/Core.FunctionalTests/Core.FunctionalTests.csproj @@ -21,8 +21,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/service/tests/Core.FunctionalTests/DataFormats/Office/MsExcelDecoderTest.cs b/service/tests/Core.FunctionalTests/DataFormats/Office/MsExcelDecoderTest.cs index c0629c893..33b097fac 100644 --- a/service/tests/Core.FunctionalTests/DataFormats/Office/MsExcelDecoderTest.cs +++ b/service/tests/Core.FunctionalTests/DataFormats/Office/MsExcelDecoderTest.cs @@ -3,7 +3,6 @@ using Microsoft.KernelMemory.DataFormats; using Microsoft.KernelMemory.DataFormats.Office; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.FunctionalTests.DataFormats.Office; diff --git a/service/tests/Core.FunctionalTests/ParallelHandlersTest.cs b/service/tests/Core.FunctionalTests/ParallelHandlersTest.cs index f4f193539..18de020cd 100644 --- a/service/tests/Core.FunctionalTests/ParallelHandlersTest.cs +++ b/service/tests/Core.FunctionalTests/ParallelHandlersTest.cs @@ -5,7 +5,6 @@ using Microsoft.KernelMemory.DocumentStorage.DevTools; using Microsoft.KernelMemory.MemoryStorage.DevTools; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.FunctionalTests; diff --git a/service/tests/Core.FunctionalTests/ServerLess/AIClients/AzureOpenAITextGeneratorTest.cs b/service/tests/Core.FunctionalTests/ServerLess/AIClients/AzureOpenAITextGeneratorTest.cs index e5d636da1..939868ddc 100644 --- a/service/tests/Core.FunctionalTests/ServerLess/AIClients/AzureOpenAITextGeneratorTest.cs +++ b/service/tests/Core.FunctionalTests/ServerLess/AIClients/AzureOpenAITextGeneratorTest.cs @@ -4,7 +4,6 @@ using Microsoft.KernelMemory.AI; using Microsoft.KernelMemory.AI.AzureOpenAI; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.FunctionalTests.ServerLess.AIClients; diff --git a/service/tests/Core.FunctionalTests/ServerLess/AIClients/OpenAITextEmbeddingGeneratorTest.cs b/service/tests/Core.FunctionalTests/ServerLess/AIClients/OpenAITextEmbeddingGeneratorTest.cs index 564a38d6c..3d8d918c1 100644 --- a/service/tests/Core.FunctionalTests/ServerLess/AIClients/OpenAITextEmbeddingGeneratorTest.cs +++ b/service/tests/Core.FunctionalTests/ServerLess/AIClients/OpenAITextEmbeddingGeneratorTest.cs @@ -2,7 +2,6 @@ using Microsoft.KernelMemory.AI.OpenAI; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.FunctionalTests.ServerLess.AIClients; diff --git a/service/tests/Core.FunctionalTests/ServerLess/AIClients/OpenAITextGeneratorTest.cs b/service/tests/Core.FunctionalTests/ServerLess/AIClients/OpenAITextGeneratorTest.cs index 49e9d975d..dc15b22e1 100644 --- a/service/tests/Core.FunctionalTests/ServerLess/AIClients/OpenAITextGeneratorTest.cs +++ b/service/tests/Core.FunctionalTests/ServerLess/AIClients/OpenAITextGeneratorTest.cs @@ -4,7 +4,6 @@ using Microsoft.KernelMemory.AI; using Microsoft.KernelMemory.AI.OpenAI; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.FunctionalTests.ServerLess.AIClients; diff --git a/service/tests/Core.FunctionalTests/ServerLess/DefaultTests.cs b/service/tests/Core.FunctionalTests/ServerLess/DefaultTests.cs index 3253c766f..c6c742fa0 100644 --- a/service/tests/Core.FunctionalTests/ServerLess/DefaultTests.cs +++ b/service/tests/Core.FunctionalTests/ServerLess/DefaultTests.cs @@ -2,7 +2,6 @@ using Microsoft.KM.Core.FunctionalTests.DefaultTestCases; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.FunctionalTests.ServerLess; diff --git a/service/tests/Core.FunctionalTests/ServerLess/OpenAIDependencyInjectionTest.cs b/service/tests/Core.FunctionalTests/ServerLess/OpenAIDependencyInjectionTest.cs index d0d081d70..a9ffd4607 100644 --- a/service/tests/Core.FunctionalTests/ServerLess/OpenAIDependencyInjectionTest.cs +++ b/service/tests/Core.FunctionalTests/ServerLess/OpenAIDependencyInjectionTest.cs @@ -2,7 +2,6 @@ using Microsoft.KernelMemory; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.FunctionalTests.ServerLess; diff --git a/service/tests/Core.FunctionalTests/ServerLess/SubDirFilesAndStreamsTest.cs b/service/tests/Core.FunctionalTests/ServerLess/SubDirFilesAndStreamsTest.cs index ce0827c4f..5bea0b249 100644 --- a/service/tests/Core.FunctionalTests/ServerLess/SubDirFilesAndStreamsTest.cs +++ b/service/tests/Core.FunctionalTests/ServerLess/SubDirFilesAndStreamsTest.cs @@ -5,7 +5,6 @@ using Microsoft.KernelMemory.FileSystem.DevTools; using Microsoft.KernelMemory.MemoryStorage.DevTools; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.FunctionalTests.ServerLess; diff --git a/service/tests/Core.FunctionalTests/VectorDbComparison/TestCosineSimilarity.cs b/service/tests/Core.FunctionalTests/VectorDbComparison/TestCosineSimilarity.cs index 86d6be415..0abbeb6a3 100644 --- a/service/tests/Core.FunctionalTests/VectorDbComparison/TestCosineSimilarity.cs +++ b/service/tests/Core.FunctionalTests/VectorDbComparison/TestCosineSimilarity.cs @@ -11,7 +11,6 @@ using Microsoft.KernelMemory.Postgres; using Microsoft.KM.TestHelpers; using StackExchange.Redis; -using Xunit.Abstractions; namespace Microsoft.KM.Core.FunctionalTests.VectorDbComparison; diff --git a/service/tests/Core.FunctionalTests/VectorDbComparison/TestMemoryFilters.cs b/service/tests/Core.FunctionalTests/VectorDbComparison/TestMemoryFilters.cs index e432ab8b7..9a1b284c6 100644 --- a/service/tests/Core.FunctionalTests/VectorDbComparison/TestMemoryFilters.cs +++ b/service/tests/Core.FunctionalTests/VectorDbComparison/TestMemoryFilters.cs @@ -11,7 +11,6 @@ using Microsoft.KernelMemory.Postgres; using Microsoft.KM.TestHelpers; using StackExchange.Redis; -using Xunit.Abstractions; namespace Microsoft.KM.Core.FunctionalTests.VectorDbComparison; diff --git a/service/tests/Core.UnitTests/Configuration/ConfigEnvVarsTest.cs b/service/tests/Core.UnitTests/Configuration/ConfigEnvVarsTest.cs index b170ceaab..0e4a40d0b 100644 --- a/service/tests/Core.UnitTests/Configuration/ConfigEnvVarsTest.cs +++ b/service/tests/Core.UnitTests/Configuration/ConfigEnvVarsTest.cs @@ -8,7 +8,6 @@ using Microsoft.KernelMemory.Pipeline.Queue.DevTools; using Microsoft.KernelMemory.Safety.AzureAIContentSafety; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.UnitTests.Configuration; diff --git a/service/tests/Core.UnitTests/Core.UnitTests.csproj b/service/tests/Core.UnitTests/Core.UnitTests.csproj index 257e94f42..670e71f21 100644 --- a/service/tests/Core.UnitTests/Core.UnitTests.csproj +++ b/service/tests/Core.UnitTests/Core.UnitTests.csproj @@ -22,8 +22,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/service/tests/Core.UnitTests/Extensions/BinaryDataExtensionsTest.cs b/service/tests/Core.UnitTests/Extensions/BinaryDataExtensionsTest.cs index 92e4d7950..16b8ea2d9 100644 --- a/service/tests/Core.UnitTests/Extensions/BinaryDataExtensionsTest.cs +++ b/service/tests/Core.UnitTests/Extensions/BinaryDataExtensionsTest.cs @@ -2,7 +2,6 @@ using Microsoft.KernelMemory.Extensions; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.UnitTests.Extensions; diff --git a/service/tests/Core.UnitTests/FileSystem/DevTools/InMemoryFileSystemTest.cs b/service/tests/Core.UnitTests/FileSystem/DevTools/InMemoryFileSystemTest.cs index 4d3839cde..da7175451 100644 --- a/service/tests/Core.UnitTests/FileSystem/DevTools/InMemoryFileSystemTest.cs +++ b/service/tests/Core.UnitTests/FileSystem/DevTools/InMemoryFileSystemTest.cs @@ -5,7 +5,6 @@ using System.Text.Json; using Microsoft.KernelMemory.FileSystem.DevTools; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.UnitTests.FileSystem.DevTools; diff --git a/service/tests/Core.UnitTests/FileSystem/DevTools/OnDiskFileSystemTest.cs b/service/tests/Core.UnitTests/FileSystem/DevTools/OnDiskFileSystemTest.cs index 22efa7b37..0e4c8c577 100644 --- a/service/tests/Core.UnitTests/FileSystem/DevTools/OnDiskFileSystemTest.cs +++ b/service/tests/Core.UnitTests/FileSystem/DevTools/OnDiskFileSystemTest.cs @@ -4,7 +4,6 @@ using System.Text.Json; using Microsoft.KernelMemory.FileSystem.DevTools; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Core.UnitTests.FileSystem.DevTools; diff --git a/service/tests/Core.UnitTests/KernelMemoryBuilderTest.cs b/service/tests/Core.UnitTests/KernelMemoryBuilderTest.cs index 73cf1693b..85cb3da5c 100644 --- a/service/tests/Core.UnitTests/KernelMemoryBuilderTest.cs +++ b/service/tests/Core.UnitTests/KernelMemoryBuilderTest.cs @@ -10,7 +10,6 @@ using Microsoft.KernelMemory.Pipeline.Queue; using Microsoft.KM.TestHelpers; using Moq; -using Xunit.Abstractions; namespace Microsoft.KM.Core.UnitTests; diff --git a/service/tests/Core.UnitTests/MemoryStorage/DevTools/SimpleVectorDbTest.cs b/service/tests/Core.UnitTests/MemoryStorage/DevTools/SimpleVectorDbTest.cs index 1df09f895..ceece6bc1 100644 --- a/service/tests/Core.UnitTests/MemoryStorage/DevTools/SimpleVectorDbTest.cs +++ b/service/tests/Core.UnitTests/MemoryStorage/DevTools/SimpleVectorDbTest.cs @@ -8,7 +8,6 @@ using Microsoft.KernelMemory.MemoryStorage.DevTools; using Microsoft.KM.TestHelpers; using Moq; -using Xunit.Abstractions; namespace Microsoft.KM.Core.UnitTests.MemoryStorage.DevTools; diff --git a/service/tests/Service.FunctionalTests/DefaultTests.cs b/service/tests/Service.FunctionalTests/DefaultTests.cs index a62da898b..2e4be6481 100644 --- a/service/tests/Service.FunctionalTests/DefaultTests.cs +++ b/service/tests/Service.FunctionalTests/DefaultTests.cs @@ -3,7 +3,6 @@ using Microsoft.KernelMemory; using Microsoft.KM.Core.FunctionalTests.DefaultTestCases; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Service.FunctionalTests; diff --git a/service/tests/Service.FunctionalTests/ImageOCRTest.cs b/service/tests/Service.FunctionalTests/ImageOCRTest.cs index 15affd34a..e3f3ecb41 100644 --- a/service/tests/Service.FunctionalTests/ImageOCRTest.cs +++ b/service/tests/Service.FunctionalTests/ImageOCRTest.cs @@ -2,7 +2,6 @@ using Microsoft.KernelMemory; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Service.FunctionalTests; diff --git a/service/tests/Service.FunctionalTests/ImportSubDirFilesTest.cs b/service/tests/Service.FunctionalTests/ImportSubDirFilesTest.cs index cbd784b3a..d923c7eee 100644 --- a/service/tests/Service.FunctionalTests/ImportSubDirFilesTest.cs +++ b/service/tests/Service.FunctionalTests/ImportSubDirFilesTest.cs @@ -2,7 +2,6 @@ using Microsoft.KernelMemory; using Microsoft.KM.TestHelpers; -using Xunit.Abstractions; namespace Microsoft.KM.Service.FunctionalTests; diff --git a/service/tests/Service.FunctionalTests/SKPluginTest.cs b/service/tests/Service.FunctionalTests/SKPluginTest.cs index fc80788da..9c3143502 100644 --- a/service/tests/Service.FunctionalTests/SKPluginTest.cs +++ b/service/tests/Service.FunctionalTests/SKPluginTest.cs @@ -4,7 +4,6 @@ using Microsoft.KernelMemory; using Microsoft.KM.TestHelpers; using Microsoft.SemanticKernel; -using Xunit.Abstractions; namespace Microsoft.KM.Service.FunctionalTests; diff --git a/service/tests/Service.FunctionalTests/Service.FunctionalTests.csproj b/service/tests/Service.FunctionalTests/Service.FunctionalTests.csproj index b72451494..a246cfe3f 100644 --- a/service/tests/Service.FunctionalTests/Service.FunctionalTests.csproj +++ b/service/tests/Service.FunctionalTests/Service.FunctionalTests.csproj @@ -22,8 +22,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/service/tests/TestHelpers/BaseFunctionalTestCase.cs b/service/tests/TestHelpers/BaseFunctionalTestCase.cs index d73110713..21585c857 100644 --- a/service/tests/TestHelpers/BaseFunctionalTestCase.cs +++ b/service/tests/TestHelpers/BaseFunctionalTestCase.cs @@ -9,7 +9,7 @@ using Microsoft.KernelMemory.FileSystem.DevTools; using Microsoft.KernelMemory.MemoryStorage.DevTools; using Microsoft.KernelMemory.MongoDbAtlas; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.KM.TestHelpers; diff --git a/service/tests/TestHelpers/BaseUnitTestCase.cs b/service/tests/TestHelpers/BaseUnitTestCase.cs index dda551348..c1f500b85 100644 --- a/service/tests/TestHelpers/BaseUnitTestCase.cs +++ b/service/tests/TestHelpers/BaseUnitTestCase.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft. All rights reserved. -using Xunit.Abstractions; +using Xunit; namespace Microsoft.KM.TestHelpers; diff --git a/service/tests/TestHelpers/RedirectConsole.cs b/service/tests/TestHelpers/RedirectConsole.cs index f731b925b..ca5d4f93e 100644 --- a/service/tests/TestHelpers/RedirectConsole.cs +++ b/service/tests/TestHelpers/RedirectConsole.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Text; -using Xunit.Abstractions; +using Xunit; namespace Microsoft.KM.TestHelpers; @@ -310,7 +310,7 @@ private void Line(string? s = null) { try { - this._output.WriteLine(s); + this._output.WriteLine(s ?? string.Empty); } catch (InvalidOperationException e) when (e.Message.Contains("no currently active test", StringComparison.OrdinalIgnoreCase)) { diff --git a/service/tests/TestHelpers/TestHelpers.csproj b/service/tests/TestHelpers/TestHelpers.csproj index 56a48ce7b..096b0fc99 100644 --- a/service/tests/TestHelpers/TestHelpers.csproj +++ b/service/tests/TestHelpers/TestHelpers.csproj @@ -20,8 +20,11 @@ - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive