Merge pull request elsa-workflows#4828 from lahma/directory-build-props

Use Directory.Build.props
faith0831 · Feb 2, 2024 · 3ff6e3e · 3ff6e3e
2 parents 5436d95 + 68beb5c
commit 3ff6e3e
Show file tree

Hide file tree

Showing 119 changed files with 84 additions and 402 deletions.
diff --git a/common.props → Directory.Build.props b/common.props → Directory.Build.props
@@ -1,16 +1,19 @@
 <Project>
  <PropertyGroup>
- <LangVersion>latest</LangVersion>
  <Authors>Elsa Workflows Community</Authors>
  <Copyright>2023</Copyright> 
+
  <PackageProjectUrl>https://github.com/elsa-workflows/elsa-core</PackageProjectUrl>
  <RepositoryUrl>https://github.com/elsa-workflows/elsa-core</RepositoryUrl>
  <RepositoryType>git</RepositoryType>
+
+ <LangVersion>latest</LangVersion>
  <Nullable>enable</Nullable>
  <ImplicitUsings>enable</ImplicitUsings>
+
  <PackageLicenseExpression>MIT</PackageLicenseExpression>
  <PackageIcon>icon.png</PackageIcon>
- 
+
  <!-- For NuGet browsers that currently don't support <PackageIcon> yet -->
  <PackageIconUrl>https://v3.elsaworkflows.io/nuget-icon.png</PackageIconUrl>
 
@@ -24,15 +27,4 @@
  <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
  </PropertyGroup>
 
- <ItemGroup Label="Files">
- <None Include="..\..\..\icon.png" Pack="true" PackagePath="\"/>
- </ItemGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
- <PrivateAssets>all</PrivateAssets>
- <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
- </PackageReference>
- <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
- </ItemGroup>
 </Project>
diff --git a/Elsa.sln b/Elsa.sln
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.7.34003.232
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{61017E64-6D00-49CB-9E81-5002DC8F7D5F}"
+ ProjectSection(SolutionItems) = preProject
+ src\Directory.Build.props = src\Directory.Build.props
+ EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{155227F0-A33B-40AA-A4B4-06F813EB921B}"
 EndProject
@@ -14,10 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution", "solution", "{7D
  .editorconfig = .editorconfig
  .gitignore = .gitignore
  build-and-run-all-in-one-web-docker.sh = build-and-run-all-in-one-web-docker.sh
- common.props = common.props
- configureawait.props = configureawait.props
+ Directory.Build.props = Directory.Build.props
  docker-compose.yml = docker-compose.yml
- frameworks.props = frameworks.props
  icon.png = icon.png
  NuGet.Config = NuGet.Config
  packages.props = packages.props
@@ -50,6 +51,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.MassTransit", "src\modules\Elsa.MassTransit\Elsa.MassTransit.csproj", "{BB983D0B-A939-4008-B9E3-C7C172BCF83A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{90031D64-CA0F-46D0-9AF4-8DC023A5FFCD}"
+ ProjectSection(SolutionItems) = preProject
+ test\Directory.Build.props = test\Directory.Build.props
+ EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Labels", "src\modules\Elsa.Labels\Elsa.Labels.csproj", "{80FF5821-E831-450D-AA0C-C76D07D878F4}"
 EndProject

diff --git a/configureawait.props b/configureawait.props
diff --git a/frameworks.props b/frameworks.props
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,25 @@
+<Project>
+
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+ <PropertyGroup>
+ <IsSampleProject Condition="$(MSBuildProjectName.Contains('.Samples.')) == true or $(MSBuildProjectName.Contains('SampleDropIn')) == true">true</IsSampleProject>
+ <IsPackable Condition="$(IsSampleProject) == 'true'">false</IsPackable>
+ </PropertyGroup>
+
+ <PropertyGroup Label="TargetFrameworks" Condition="$(IsSampleProject) != 'true'">
+ <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+ </PropertyGroup>
+
+ <ItemGroup Label="Files">
+ <None Include="..\..\..\icon.png" Pack="true" PackagePath="\"/>
+ </ItemGroup>
+
+ <ItemGroup Condition="$(IsSampleProject) != 'true'">
+ <PackageReference Include="ConfigureAwait.Fody" Version="3.3.2" PrivateAssets="All" />
+ <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="All" />
+ <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+ </ItemGroup>
+
+</Project>
diff --git a/src/bundles/Elsa.Server.Web/Elsa.Server.Web.csproj b/src/bundles/Elsa.Server.Web/Elsa.Server.Web.csproj
@@ -2,8 +2,6 @@
 
  <PropertyGroup>
  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
- <Nullable>enable</Nullable>
- <ImplicitUsings>enable</ImplicitUsings>
  <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
  <IsPackable>false</IsPackable>
  <LangVersion>latest</LangVersion>

diff --git a/src/bundles/Elsa.Server.Web/FodyWeavers.xml b/src/bundles/Elsa.Server.Web/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+ <ConfigureAwait />
+</Weavers>
diff --git a/src/bundles/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj b/src/bundles/Elsa.ServerAndStudio.Web/Elsa.ServerAndStudio.Web.csproj
@@ -2,8 +2,6 @@
 
  <PropertyGroup>
  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
- <Nullable>enable</Nullable>
- <ImplicitUsings>enable</ImplicitUsings>
  <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
  <IsPackable>false</IsPackable>
  </PropertyGroup>

diff --git a/src/bundles/Elsa.ServerAndStudio.Web/FodyWeavers.xml b/src/bundles/Elsa.ServerAndStudio.Web/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+ <ConfigureAwait />
+</Weavers>
diff --git a/src/bundles/Elsa.Studio.Web/Elsa.Studio.Web.csproj b/src/bundles/Elsa.Studio.Web/Elsa.Studio.Web.csproj
@@ -2,8 +2,6 @@
 
  <PropertyGroup>
  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
- <Nullable>enable</Nullable>
- <ImplicitUsings>enable</ImplicitUsings>
  <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
  <IsPackable>false</IsPackable>
  </PropertyGroup>

diff --git a/src/bundles/Elsa.Studio.Web/FodyWeavers.xml b/src/bundles/Elsa.Studio.Web/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+ <ConfigureAwait />
+</Weavers>
diff --git a/src/bundles/Elsa/Elsa.csproj b/src/bundles/Elsa/Elsa.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props" />
- <Import Project="..\..\..\configureawait.props" />
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Bundles the most commonly-used packages when building an Elsa workflows application.

diff --git a/src/bundles/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj b/src/bundles/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj
@@ -2,8 +2,6 @@
 
  <PropertyGroup>
  <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
- <Nullable>enable</Nullable>
- <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>
 
  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">

diff --git a/src/bundles/ElsaStudioWebAssembly/FodyWeavers.xml b/src/bundles/ElsaStudioWebAssembly/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+ <ConfigureAwait />
+</Weavers>
diff --git a/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj b/src/clients/Elsa.Api.Client/Elsa.Api.Client.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Provides HTTP clients for the Elsa Workflows REST API.

diff --git a/src/common/Elsa.Api.Common/Elsa.Api.Common.csproj b/src/common/Elsa.Api.Common/Elsa.Api.Common.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Provides common features to modules that expose API endpoints.

diff --git a/src/common/Elsa.DropIns.Core/Elsa.DropIns.Core.csproj b/src/common/Elsa.DropIns.Core/Elsa.DropIns.Core.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Reference this package when developing drop-ins for Elsa Workflows.

diff --git a/src/common/Elsa.DropIns/Elsa.DropIns.csproj b/src/common/Elsa.DropIns/Elsa.DropIns.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props" />
- <Import Project="..\..\..\configureawait.props" />
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Provides drop-in features for Elsa workflows.

diff --git a/src/common/Elsa.Features/Elsa.Features.csproj b/src/common/Elsa.Features/Elsa.Features.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Provides utilities to turn your class library into a module that provides features.

diff --git a/src/common/Elsa.Mediator/Elsa.Mediator.csproj b/src/common/Elsa.Mediator/Elsa.Mediator.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props" />
- <Import Project="..\..\..\configureawait.props" />
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Provides a mediator service inspired by MediatR.

diff --git a/src/common/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj b/src/common/Elsa.Testing.Shared/Elsa.Testing.Shared.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props" />
- <Import Project="..\..\..\configureawait.props" />
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Provides common utilities that are helpful when writing tests against Elsa Workflows functionality.

diff --git a/src/modules/Elsa.Alterations.Core/Elsa.Alterations.Core.csproj b/src/modules/Elsa.Alterations.Core/Elsa.Alterations.Core.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Provides core interfaces, models and services that support the alteration engine.

diff --git a/src/modules/Elsa.Alterations.MassTransit/Elsa.Alterations.MassTransit.csproj b/src/modules/Elsa.Alterations.MassTransit/Elsa.Alterations.MassTransit.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props" />
- <Import Project="..\..\..\configureawait.props" />
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Provides alteration background job runners using MassTransit.

diff --git a/src/modules/Elsa.Alterations/Elsa.Alterations.csproj b/src/modules/Elsa.Alterations/Elsa.Alterations.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Provides alterations for workflow instances.

diff --git a/src/modules/Elsa.AzureServiceBus/Elsa.AzureServiceBus.csproj b/src/modules/Elsa.AzureServiceBus/Elsa.AzureServiceBus.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Provides Azure Service Bus integration and activities.

diff --git a/src/modules/Elsa.CSharp/Elsa.CSharp.csproj b/src/modules/Elsa.CSharp/Elsa.CSharp.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props" />
- <Import Project="..\..\..\configureawait.props" />
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Provides a CSharp expression provider.

diff --git a/src/modules/Elsa.Common/Elsa.Common.csproj b/src/modules/Elsa.Common/Elsa.Common.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props" />
- <Import Project="..\..\..\configureawait.props" />
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Provides services and utility functions common to Elsa modules.

diff --git a/src/modules/Elsa.Dapper.Migrations/Elsa.Dapper.Migrations.csproj b/src/modules/Elsa.Dapper.Migrations/Elsa.Dapper.Migrations.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props" />
- <Import Project="..\..\..\configureawait.props" />
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Provides Dapper migrations for Dapper perisstence providers from various modules.

diff --git a/src/modules/Elsa.Dapper/Elsa.Dapper.csproj b/src/modules/Elsa.Dapper/Elsa.Dapper.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Provides Dapper implementations of various persistence abstractions from various modules.

diff --git a/src/modules/Elsa.Dsl/Elsa.Dsl.csproj b/src/modules/Elsa.Dsl/Elsa.Dsl.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props" />
- <Import Project="..\..\..\configureawait.props" />
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Provides a custom DSL to write workflows with in a syntax similar to JavaScript but with native keywords translating to workflow functionality.

diff --git a/src/modules/Elsa.Elasticsearch/Elsa.Elasticsearch.csproj b/src/modules/Elsa.Elasticsearch/Elsa.Elasticsearch.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props" />
- <Import Project="..\..\..\configureawait.props" />
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Provides Elasticsearch implementation for workflow state persistence.

diff --git a/src/modules/Elsa.Email/Elsa.Email.csproj b/src/modules/Elsa.Email/Elsa.Email.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Provides a SendEmail activity that lets you send emails from a workflow.

diff --git a/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj b/src/modules/Elsa.EntityFrameworkCore.Common/Elsa.EntityFrameworkCore.Common.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Provides common Entity Framework Core types for implementing EF Core persistence of varipus ELsa modules.

diff --git a/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj b/src/modules/Elsa.EntityFrameworkCore.MySql/Elsa.EntityFrameworkCore.MySql.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props" />
-
  <PropertyGroup>
  <Description>
  Provides MySQL EF Core migrations for various modules.

diff --git a/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj b/src/modules/Elsa.EntityFrameworkCore.PostgreSql/Elsa.EntityFrameworkCore.PostgreSql.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\common.props"/>
- <Import Project="..\..\..\configureawait.props"/>
- <Import Project="..\..\..\frameworks.props"/>
-
  <PropertyGroup>
  <Description>
  Provides PostgreSQL EF Core migrations for various modules.