diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 1f7a97ee8..cf8918ced 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -78,7 +78,6 @@ "items": { "type": "string", "enum": [ - "Analyze", "Clean", "Compile", "Pack", @@ -97,7 +96,6 @@ "items": { "type": "string", "enum": [ - "Analyze", "Clean", "Compile", "Pack", diff --git a/Directory.Build.props b/Directory.Build.props index d8bd0329d..570aa11e8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,6 +21,9 @@ Default latest + enable + all + true snupkg diff --git a/Directory.Packages.props b/Directory.Packages.props index 0c351582b..a6b109274 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -54,6 +54,7 @@ + @@ -89,8 +90,11 @@ + + + @@ -108,7 +112,7 @@ - + @@ -138,7 +142,7 @@ - + diff --git a/build/Build.CI.GitHubActions.cs b/build/Build.CI.GitHubActions.cs index dc69dd705..052ca483e 100644 --- a/build/Build.CI.GitHubActions.cs +++ b/build/Build.CI.GitHubActions.cs @@ -4,9 +4,7 @@ using Nuke.Components; [GitHubActions( "pr", GitHubActionsImage.UbuntuLatest, - On = [GitHubActionsTrigger.Push, GitHubActionsTrigger.PullRequest, GitHubActionsTrigger.WorkflowDispatch], - OnPushBranches = ["main", "feature/*", "patch/*", "fix/*", "enhancement/*"], - OnPullRequestBranches = ["main", "feature/*", "patch/*", "fix/*", "enhancement/*"], + OnPullRequestBranches = ["main"], OnPullRequestIncludePaths = ["**/*"], PublishArtifacts = false, InvokedTargets = [nameof(ICompile.Compile), nameof(ITest.Test), nameof(IPack.Pack)], diff --git a/build/Build.cs b/build/Build.cs index 9151ed62d..769673dd1 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -10,7 +10,6 @@ using Nuke.Common.ProjectModel; using Nuke.Common.Tooling; using Nuke.Common.Tools.Coverlet; using Nuke.Common.Tools.DotNet; -using Nuke.Common.Tools.SonarScanner; using Nuke.Common.Utilities.Collections; using Nuke.Components; using Serilog; @@ -60,10 +59,12 @@ partial class Build : NukeBuild, ITest, IPack { SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(x => x.DeleteDirectory()); ((IHazArtifacts)this).ArtifactsDirectory.CreateOrCleanDirectory(); - + TestResultDirectory.CreateOrCleanDirectory(); }); - + + public Configure RestoreSettings => _ => _ + .SetVerbosity(DotNetVerbosity.quiet); public Configure CompileSettings => _ => _ // ensure we don't generate too much output in CI run @@ -76,10 +77,13 @@ partial class Build : NukeBuild, ITest, IPack public Configure TestProjectSettings => (testSettings, project) => testSettings .When(GitHubActions.Instance is not null, settings => settings.AddLoggers("GitHubActions;report-warnings=false")) - .When(AnalyseCode, settings => settings.SetCoverletOutputFormat(CoverletOutputFormat.opencover)) - .When(AnalyseCode, settings => settings.EnableCollectCoverage()) - .When(AnalyseCode, settings => settings.SetResultsDirectory(TestResultDirectory)) - .When(AnalyseCode, settings => settings.SetCoverletOutput($"{TestResultDirectory}/opencoverCoverage.xml")) - .When(AnalyseCode, settings => settings.SetProcessArgumentConfigurator(args => - args.Add("--collect:\"XPlat Code Coverage;Format=opencover\""))); + .When(AnalyseCode, settings => settings + .SetCoverletOutputFormat(CoverletOutputFormat.opencover) + .EnableCollectCoverage() + .SetResultsDirectory(TestResultDirectory) + .SetCoverletOutput($"{TestResultDirectory}/opencoverCoverage.xml") + .SetProcessArgumentConfigurator(args => + args.Add("--collect:\"XPlat Code Coverage;Format=opencover\"") + ) + ); } \ No newline at end of file diff --git a/build/_build.csproj b/build/_build.csproj index 4e4b70e2d..d3e9cb325 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -14,16 +14,21 @@ true false false + enable + all - + - - + + + + + diff --git a/samples/aspnet/Elsa.Samples.AspNet.EntityFrameworkCore.PostgresSql/Elsa.Samples.AspNet.EntityFrameworkCore.PostgresSql.csproj b/samples/aspnet/Elsa.Samples.AspNet.EntityFrameworkCore.PostgresSql/Elsa.Samples.AspNet.EntityFrameworkCore.PostgresSql.csproj index d92cb6726..cafed9d4a 100644 --- a/samples/aspnet/Elsa.Samples.AspNet.EntityFrameworkCore.PostgresSql/Elsa.Samples.AspNet.EntityFrameworkCore.PostgresSql.csproj +++ b/samples/aspnet/Elsa.Samples.AspNet.EntityFrameworkCore.PostgresSql/Elsa.Samples.AspNet.EntityFrameworkCore.PostgresSql.csproj @@ -1,7 +1,7 @@ - net7.0;net8.0 + net8.0 diff --git a/samples/aspnet/Elsa.Samples.AspNet.Onboarding.Web/Elsa.Samples.AspNet.Onboarding.Web.csproj b/samples/aspnet/Elsa.Samples.AspNet.Onboarding.Web/Elsa.Samples.AspNet.Onboarding.Web.csproj index 8c608a6e1..5690e3862 100644 --- a/samples/aspnet/Elsa.Samples.AspNet.Onboarding.Web/Elsa.Samples.AspNet.Onboarding.Web.csproj +++ b/samples/aspnet/Elsa.Samples.AspNet.Onboarding.Web/Elsa.Samples.AspNet.Onboarding.Web.csproj @@ -18,4 +18,10 @@ + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 843d67641..607b67398 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,7 +3,7 @@ - net6.0;net7.0;net8.0 + net6.0;net8.0 diff --git a/src/apps/Elsa.Server.LoadBalancer/Elsa.Server.LoadBalancer.csproj b/src/apps/Elsa.Server.LoadBalancer/Elsa.Server.LoadBalancer.csproj index ab5408636..90dec8fea 100644 --- a/src/apps/Elsa.Server.LoadBalancer/Elsa.Server.LoadBalancer.csproj +++ b/src/apps/Elsa.Server.LoadBalancer/Elsa.Server.LoadBalancer.csproj @@ -1,7 +1,7 @@ - net7.0;net8.0 + net8.0 Linux false latest diff --git a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj index e956af634..2aef9d511 100644 --- a/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj +++ b/src/apps/Elsa.Server.Web/Elsa.Server.Web.csproj @@ -50,10 +50,5 @@ - - - - - diff --git a/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj b/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj index da92e4dec..7a84815f5 100644 --- a/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj +++ b/src/apps/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj @@ -1,7 +1,7 @@ - net7.0;net8.0 + net8.0 Linux false @@ -40,9 +40,4 @@ - - - - - \ No newline at end of file diff --git a/src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj b/src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj index 432ff7c6c..3faed797c 100644 --- a/src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj +++ b/src/apps/Elsa.Studio.Web/Elsa.Studio.Web.csproj @@ -1,7 +1,7 @@ - net7.0;net8.0 + net8.0 Linux false @@ -16,11 +16,6 @@ - - - - - diff --git a/src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj b/src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj index eba2a2fd1..02c5db25a 100644 --- a/src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj +++ b/src/apps/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj @@ -1,7 +1,7 @@ - net7.0;net8.0 + net8.0 diff --git a/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj b/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj index 7ce828980..a740fd26b 100644 --- a/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj +++ b/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj @@ -17,9 +17,9 @@ - + - + diff --git a/src/common/Elsa.DropIns/Elsa.DropIns.csproj b/src/common/Elsa.DropIns/Elsa.DropIns.csproj index d77a55517..f26afbffa 100644 --- a/src/common/Elsa.DropIns/Elsa.DropIns.csproj +++ b/src/common/Elsa.DropIns/Elsa.DropIns.csproj @@ -12,12 +12,12 @@ + - + - diff --git a/src/common/Elsa.Testing.Shared.Component/Elsa.Testing.Shared.Component.csproj b/src/common/Elsa.Testing.Shared.Component/Elsa.Testing.Shared.Component.csproj index 4770b1d26..3e0b5a475 100644 --- a/src/common/Elsa.Testing.Shared.Component/Elsa.Testing.Shared.Component.csproj +++ b/src/common/Elsa.Testing.Shared.Component/Elsa.Testing.Shared.Component.csproj @@ -1,4 +1,4 @@ - + diff --git a/src/modules/Elsa.Common/Elsa.Common.csproj b/src/modules/Elsa.Common/Elsa.Common.csproj index aeee7011b..e48b149e2 100644 --- a/src/modules/Elsa.Common/Elsa.Common.csproj +++ b/src/modules/Elsa.Common/Elsa.Common.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/modules/Elsa.Dapper/Elsa.Dapper.csproj b/src/modules/Elsa.Dapper/Elsa.Dapper.csproj index 39461f1aa..aaceef3cf 100644 --- a/src/modules/Elsa.Dapper/Elsa.Dapper.csproj +++ b/src/modules/Elsa.Dapper/Elsa.Dapper.csproj @@ -15,26 +15,16 @@ - - - - - - - + + + - - - - - - - + diff --git a/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj b/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj index 35dc2514a..77f8082ac 100644 --- a/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj @@ -17,11 +17,11 @@ - + - + - + diff --git a/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj b/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj index 5df8320c1..c00d3b8d7 100644 --- a/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj @@ -12,11 +12,6 @@ - - - - - diff --git a/src/modules/Elsa.EntityFrameworkCore.Oracle/Elsa.EntityFrameworkCore.Oracle.csproj b/src/modules/Elsa.EntityFrameworkCore.Oracle/Elsa.EntityFrameworkCore.Oracle.csproj index 1157e64ec..c4ecf6716 100644 --- a/src/modules/Elsa.EntityFrameworkCore.Oracle/Elsa.EntityFrameworkCore.Oracle.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.Oracle/Elsa.EntityFrameworkCore.Oracle.csproj @@ -15,5 +15,10 @@ - + + + + + + diff --git a/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj b/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj index ce9f15c01..e0f1c22ec 100644 --- a/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj @@ -12,11 +12,6 @@ - - - - - diff --git a/src/modules/Elsa.EntityFrameworkCore.SqlServer/Elsa.EntityFrameworkCore.SqlServer.csproj b/src/modules/Elsa.EntityFrameworkCore.SqlServer/Elsa.EntityFrameworkCore.SqlServer.csproj index 2a69f65ae..40e587431 100644 --- a/src/modules/Elsa.EntityFrameworkCore.SqlServer/Elsa.EntityFrameworkCore.SqlServer.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.SqlServer/Elsa.EntityFrameworkCore.SqlServer.csproj @@ -16,11 +16,11 @@ - + - - - - + + + + \ No newline at end of file diff --git a/src/modules/Elsa.EntityFrameworkCore.Sqlite/Elsa.EntityFrameworkCore.Sqlite.csproj b/src/modules/Elsa.EntityFrameworkCore.Sqlite/Elsa.EntityFrameworkCore.Sqlite.csproj index 6580755a3..7b7edfa04 100644 --- a/src/modules/Elsa.EntityFrameworkCore.Sqlite/Elsa.EntityFrameworkCore.Sqlite.csproj +++ b/src/modules/Elsa.EntityFrameworkCore.Sqlite/Elsa.EntityFrameworkCore.Sqlite.csproj @@ -13,11 +13,6 @@ - - - - - diff --git a/src/modules/Elsa.EntityFrameworkCore/Elsa.EntityFrameworkCore.csproj b/src/modules/Elsa.EntityFrameworkCore/Elsa.EntityFrameworkCore.csproj index 3dd2e4a6a..de6e8cbb4 100644 --- a/src/modules/Elsa.EntityFrameworkCore/Elsa.EntityFrameworkCore.csproj +++ b/src/modules/Elsa.EntityFrameworkCore/Elsa.EntityFrameworkCore.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/src/modules/Elsa.FileStorage/Elsa.FileStorage.csproj b/src/modules/Elsa.FileStorage/Elsa.FileStorage.csproj index 0393bc645..60d30ee8d 100644 --- a/src/modules/Elsa.FileStorage/Elsa.FileStorage.csproj +++ b/src/modules/Elsa.FileStorage/Elsa.FileStorage.csproj @@ -15,11 +15,11 @@ - + - + - + diff --git a/src/modules/Elsa.Http/Elsa.Http.csproj b/src/modules/Elsa.Http/Elsa.Http.csproj index 443c49132..cd4a44274 100644 --- a/src/modules/Elsa.Http/Elsa.Http.csproj +++ b/src/modules/Elsa.Http/Elsa.Http.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/src/modules/Elsa.MassTransit.AzureServiceBus/Elsa.MassTransit.AzureServiceBus.csproj b/src/modules/Elsa.MassTransit.AzureServiceBus/Elsa.MassTransit.AzureServiceBus.csproj index 2459b75a0..872370f9b 100644 --- a/src/modules/Elsa.MassTransit.AzureServiceBus/Elsa.MassTransit.AzureServiceBus.csproj +++ b/src/modules/Elsa.MassTransit.AzureServiceBus/Elsa.MassTransit.AzureServiceBus.csproj @@ -13,13 +13,9 @@ + - - - - - - + diff --git a/src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj b/src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj index 39d38e218..91fc3bdff 100644 --- a/src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj +++ b/src/modules/Elsa.MongoDb/Elsa.MongoDb.csproj @@ -13,11 +13,6 @@ - - - - - diff --git a/src/modules/Elsa.Quartz.EntityFrameworkCore.MySql/Elsa.Quartz.EntityFrameworkCore.MySql.csproj b/src/modules/Elsa.Quartz.EntityFrameworkCore.MySql/Elsa.Quartz.EntityFrameworkCore.MySql.csproj index a2e95de32..d0ac5a8fa 100644 --- a/src/modules/Elsa.Quartz.EntityFrameworkCore.MySql/Elsa.Quartz.EntityFrameworkCore.MySql.csproj +++ b/src/modules/Elsa.Quartz.EntityFrameworkCore.MySql/Elsa.Quartz.EntityFrameworkCore.MySql.csproj @@ -14,11 +14,6 @@ - - - - - diff --git a/src/modules/Elsa.Quartz.EntityFrameworkCore.PostgreSql/Elsa.Quartz.EntityFrameworkCore.PostgreSql.csproj b/src/modules/Elsa.Quartz.EntityFrameworkCore.PostgreSql/Elsa.Quartz.EntityFrameworkCore.PostgreSql.csproj index 8cca95901..43788dd8e 100644 --- a/src/modules/Elsa.Quartz.EntityFrameworkCore.PostgreSql/Elsa.Quartz.EntityFrameworkCore.PostgreSql.csproj +++ b/src/modules/Elsa.Quartz.EntityFrameworkCore.PostgreSql/Elsa.Quartz.EntityFrameworkCore.PostgreSql.csproj @@ -11,20 +11,10 @@ + - - - - - - - - - - - diff --git a/src/modules/Elsa.Quartz.EntityFrameworkCore.SqlServer/Elsa.Quartz.EntityFrameworkCore.SqlServer.csproj b/src/modules/Elsa.Quartz.EntityFrameworkCore.SqlServer/Elsa.Quartz.EntityFrameworkCore.SqlServer.csproj index f33bc9af8..f150fdcdb 100644 --- a/src/modules/Elsa.Quartz.EntityFrameworkCore.SqlServer/Elsa.Quartz.EntityFrameworkCore.SqlServer.csproj +++ b/src/modules/Elsa.Quartz.EntityFrameworkCore.SqlServer/Elsa.Quartz.EntityFrameworkCore.SqlServer.csproj @@ -19,11 +19,10 @@ - + - - - - + + + \ No newline at end of file diff --git a/src/modules/Elsa.Quartz.EntityFrameworkCore.Sqlite/Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj b/src/modules/Elsa.Quartz.EntityFrameworkCore.Sqlite/Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj index 283ff1ffb..63abad7b2 100644 --- a/src/modules/Elsa.Quartz.EntityFrameworkCore.Sqlite/Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj +++ b/src/modules/Elsa.Quartz.EntityFrameworkCore.Sqlite/Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj @@ -13,11 +13,6 @@ - - - - - diff --git a/src/modules/Elsa.Quartz/Elsa.Quartz.csproj b/src/modules/Elsa.Quartz/Elsa.Quartz.csproj index b3b846943..32b848409 100644 --- a/src/modules/Elsa.Quartz/Elsa.Quartz.csproj +++ b/src/modules/Elsa.Quartz/Elsa.Quartz.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net8.0 Provides integration with the Quartz.NET library and provide am implementation of Elsa's IJobScheduler using Quartz.NET. diff --git a/src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj b/src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj index ae23a5915..12026827f 100644 --- a/src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj +++ b/src/modules/Elsa.Telnyx/Elsa.Telnyx.csproj @@ -22,9 +22,9 @@ - + - + diff --git a/src/modules/Elsa.WorkflowProviders.BlobStorage/Elsa.WorkflowProviders.BlobStorage.csproj b/src/modules/Elsa.WorkflowProviders.BlobStorage/Elsa.WorkflowProviders.BlobStorage.csproj index c6c83beb6..6e6ed94eb 100644 --- a/src/modules/Elsa.WorkflowProviders.BlobStorage/Elsa.WorkflowProviders.BlobStorage.csproj +++ b/src/modules/Elsa.WorkflowProviders.BlobStorage/Elsa.WorkflowProviders.BlobStorage.csproj @@ -15,8 +15,9 @@ - + - + + diff --git a/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj b/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj index 95079450f..c216dc49d 100644 --- a/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj +++ b/src/modules/Elsa.Workflows.Api/Elsa.Workflows.Api.csproj @@ -15,8 +15,4 @@ - - - -