diff --git a/Directory.Packages.props b/Directory.Packages.props index fc06e478b..da43c92db 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,42 +3,42 @@ true - + - - + + - - + + - - - - - + + + + + - + - + - + - + - + - - + + @@ -46,22 +46,22 @@ - + - - + + - + - - - - + + + + @@ -73,7 +73,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -85,11 +85,11 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -100,15 +100,15 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/KernelMemory.sln b/KernelMemory.sln index 322c19538..e2e61bd07 100644 --- a/KernelMemory.sln +++ b/KernelMemory.sln @@ -94,11 +94,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{B897 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{48E79819-1E9E-4075-90DA-BAEC761C89B2}" ProjectSection(SolutionItems) = preProject - .github\workflows\docker-build-push.yml = .github\workflows\docker-build-push.yml .github\workflows\dotnet-build.yml = .github\workflows\dotnet-build.yml .github\workflows\dotnet-unit-tests.yml = .github\workflows\dotnet-unit-tests.yml .github\workflows\github-pages-jekyll.yml = .github\workflows\github-pages-jekyll.yml .github\workflows\spell-check-with-typos.yml = .github\workflows\spell-check-with-typos.yml + .github\workflows\docker-amd64.yml = .github\workflows\docker-amd64.yml + .github\workflows\docker-armd64.yml = .github\workflows\docker-armd64.yml + .github\workflows\fortify.yml = .github\workflows\fortify.yml + .github\workflows\securitycodescan.yml = .github\workflows\securitycodescan.yml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "service", "service", "{87DEAE8D-138C-4FDD-B4C9-11C3A7817E8F}" diff --git a/examples/002-dotnet-Serverless/002-dotnet-Serverless.csproj b/examples/002-dotnet-Serverless/002-dotnet-Serverless.csproj index 6fb653ed3..43495de15 100644 --- a/examples/002-dotnet-Serverless/002-dotnet-Serverless.csproj +++ b/examples/002-dotnet-Serverless/002-dotnet-Serverless.csproj @@ -13,6 +13,15 @@ + + + + + + + + diff --git a/examples/204-dotnet-ASP.NET-MVC-integration/204-dotnet-ASP.NET-MVC-integration.csproj b/examples/204-dotnet-ASP.NET-MVC-integration/204-dotnet-ASP.NET-MVC-integration.csproj index 876a7af53..48004fe88 100644 --- a/examples/204-dotnet-ASP.NET-MVC-integration/204-dotnet-ASP.NET-MVC-integration.csproj +++ b/examples/204-dotnet-ASP.NET-MVC-integration/204-dotnet-ASP.NET-MVC-integration.csproj @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/examples/204-dotnet-ASP.NET-MVC-integration/Program.cs b/examples/204-dotnet-ASP.NET-MVC-integration/Program.cs index f7710b26f..e483a20ab 100644 --- a/examples/204-dotnet-ASP.NET-MVC-integration/Program.cs +++ b/examples/204-dotnet-ASP.NET-MVC-integration/Program.cs @@ -27,7 +27,7 @@ wepApp.MapControllers(); // Optional: add Kernel Memory web endpoints -wepApp.AddGetIndexesEndpoint("/km/"); // GET /km/indexes +wepApp.AddListIndexesEndpoint("/km/"); // GET /km/indexes // Start ASP.NET app wepApp.Run(); diff --git a/examples/301-discord-test-application/301-discord-test-application.csproj b/examples/301-discord-test-application/301-discord-test-application.csproj index 1587e2656..1cb5af0ea 100644 --- a/examples/301-discord-test-application/301-discord-test-application.csproj +++ b/examples/301-discord-test-application/301-discord-test-application.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/examples/301-discord-test-application/DiscordMessageHandler.cs b/examples/301-discord-test-application/DiscordMessageHandler.cs index eb8bb8a33..3305d5c30 100644 --- a/examples/301-discord-test-application/DiscordMessageHandler.cs +++ b/examples/301-discord-test-application/DiscordMessageHandler.cs @@ -49,7 +49,7 @@ public DiscordMessageHandler( this._firstInvokeDb = serviceProvider.GetService() ?? throw new ConfigurationException("Discord DB Content is not defined"); } - public async Task<(bool success, DataPipeline updatedPipeline)> InvokeAsync(DataPipeline pipeline, CancellationToken cancellationToken = default) + public async Task<(ReturnType returnType, DataPipeline updatedPipeline)> InvokeAsync(DataPipeline pipeline, CancellationToken cancellationToken = default) { this.OnFirstInvoke(); @@ -75,13 +75,13 @@ public DiscordMessageHandler( if (data == null) { this._log.LogError("Failed to deserialize Discord data file, result is NULL"); - return (true, pipeline); + return (ReturnType.FatalError, pipeline); } } catch (Exception e) { this._log.LogError(e, "Failed to deserialize Discord data file"); - return (true, pipeline); + return (ReturnType.FatalError, pipeline); } await db.Messages.AddAsync(data, cancellationToken).ConfigureAwait(false); @@ -90,7 +90,7 @@ public DiscordMessageHandler( await db.SaveChangesAsync(cancellationToken).ConfigureAwait(false); } - return (true, pipeline); + return (ReturnType.Success, pipeline); } public void Dispose() diff --git a/service/tests/Abstractions.UnitTests/Http/SSETest.cs b/service/tests/Abstractions.UnitTests/Http/SSETest.cs index ffa463737..fe66ee1f8 100644 --- a/service/tests/Abstractions.UnitTests/Http/SSETest.cs +++ b/service/tests/Abstractions.UnitTests/Http/SSETest.cs @@ -6,6 +6,7 @@ namespace Microsoft.KM.Abstractions.UnitTests.Http; +[Trait("Category", "UnitTest")] public class SSETest { [Theory] diff --git a/service/tests/Core.UnitTests/Configuration/ConfigEnvVarsTest.cs b/service/tests/Core.UnitTests/Configuration/ConfigEnvVarsTest.cs index cb6b84c60..b170ceaab 100644 --- a/service/tests/Core.UnitTests/Configuration/ConfigEnvVarsTest.cs +++ b/service/tests/Core.UnitTests/Configuration/ConfigEnvVarsTest.cs @@ -12,6 +12,7 @@ namespace Microsoft.KM.Core.UnitTests.Configuration; +[Trait("Category", "UnitTest")] public class ConfigEnvVarsTest : BaseUnitTestCase { public ConfigEnvVarsTest(ITestOutputHelper output) : base(output)