From 3f274c9b47da05ac78609e2d8a74f1e9ea4cba0f Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Mon, 31 May 2021 11:35:06 +0200
Subject: [PATCH] Fix server startup

---
 Elsa.sln                                      |  3 ++-
 ...ks.Persistence.EntityFramework.Core.csproj |  6 ------
 .../Elsa.Samples.Server.Host/Startup.cs       | 20 +++----------------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/Elsa.sln b/Elsa.sln
index c616b0abb..8cf20f074 100644
--- a/Elsa.sln
+++ b/Elsa.sln
@@ -244,6 +244,7 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.DistributedLocking.Redis", "src\locking\Elsa.DistributedLocking.Redis\Elsa.DistributedLocking.Redis.csproj", "{7E5514AC-3633-4237-9490-0992417F2273}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.DistributedLocking.AzureBlob", "src\locking\Elsa.DistributedLocking.AzureBlob\Elsa.DistributedLocking.AzureBlob.csproj", "{495BE954-E6EA-41A9-8054-A5CA5DD0924E}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.DistributedLocking.AzureBlob", "src\locking\Elsa.DistributedLocking.AzureBlob\Elsa.DistributedLocking.AzureBlob.csproj", "{495BE954-E6EA-41A9-8054-A5CA5DD0924E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "blazor", "blazor", "{D86B94DC-A53C-4A67-A820-828DD359C49B}"
@@ -878,7 +879,6 @@ Global
 		{346A3A87-A839-499A-A143-3D267A951905} = {22E75696-6FE9-436A-9097-EE21C603F818}
 		{E3EA6449-28EC-48E4-91C4-E82DE08A7DD9} = {C865B0FD-E505-48F0-BFAF-0D4D7C1B5CA1}
 		{93878BAD-855D-48D1-97ED-C776EC54E19E} = {B43B546E-23F3-46E8-ACB7-D04F05CDA180}
-		{2B67E954-3B04-402D-A9A7-AAAB1D6C3215} = {B43B546E-23F3-46E8-ACB7-D04F05CDA180}
 		{76BD888E-F0FD-40DD-B025-2ED773C1C50B} = {468E498C-59DB-4541-8D8A-0D89DE9083AB}
 		{546C123A-F855-459F-886C-9D90AA14D12B} = {468E498C-59DB-4541-8D8A-0D89DE9083AB}
 		{C890480A-F21B-4F6F-821A-67FA19DAD539} = {22E75696-6FE9-436A-9097-EE21C603F818}
@@ -919,6 +919,7 @@ Global
 		{14B95595-9C34-4337-8295-43BB878ABB7B} = {9DBE0062-22F7-4E96-B3B0-B39D274C4A8D}
 		{A998F0D4-08D7-4B2A-AC17-D20E45BB40B3} = {9DBE0062-22F7-4E96-B3B0-B39D274C4A8D}
 		{8DA03FFB-8AE7-440E-9CDB-1EA1E93A6B4C} = {A998F0D4-08D7-4B2A-AC17-D20E45BB40B3}
+		{2B67E954-3B04-402D-A9A7-AAAB1D6C3215} = {9DBE0062-22F7-4E96-B3B0-B39D274C4A8D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8B0975FD-7050-48B0-88C5-48C33378E158}
diff --git a/src/activities/Elsa.Webhooks.Persistence.EntityFramework.Core/Elsa.Webhooks.Persistence.EntityFramework.Core.csproj b/src/activities/Elsa.Webhooks.Persistence.EntityFramework.Core/Elsa.Webhooks.Persistence.EntityFramework.Core.csproj
index c3e12d7e1..bf663e02d 100644
--- a/src/activities/Elsa.Webhooks.Persistence.EntityFramework.Core/Elsa.Webhooks.Persistence.EntityFramework.Core.csproj
+++ b/src/activities/Elsa.Webhooks.Persistence.EntityFramework.Core/Elsa.Webhooks.Persistence.EntityFramework.Core.csproj
@@ -4,12 +4,6 @@
     <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Services\**" />
-    <EmbeddedResource Remove="Services\**" />
-    <None Remove="Services\**" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" />
     <PackageReference Include="EFCore.BulkExtensions" Version="5.2.2" />
diff --git a/src/samples/server/Elsa.Samples.Server.Host/Startup.cs b/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
index ce92aa122..9991eaaf3 100644
--- a/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
+++ b/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
@@ -1,23 +1,12 @@
 using Elsa.Activities.UserTask.Extensions;
 using Elsa.Persistence.EntityFramework.Core.Extensions;
 using Elsa.Persistence.EntityFramework.Sqlite;
-<<<<<<< Updated upstream
-=======
-//using Elsa.Persistence.MongoDb.Extensions;
-using Elsa.Persistence.YesSql;
-using Elsa.Rebus.RabbitMq;
->>>>>>> Stashed changes
+using Microsoft.Extensions.Hosting;
 using Elsa.Samples.Server.Host.Activities;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-<<<<<<< Updated upstream
-=======
-using MongoDB.Bson.Serialization;
-//using YesSql.Provider.PostgreSql;
->>>>>>> Stashed changes
 
 namespace Elsa.Samples.Server.Host
 {
@@ -42,17 +31,14 @@ namespace Elsa.Samples.Server.Host
                 .AddActivityPropertyOptionsProvider<VehicleActivity>()
                 .AddRuntimeSelectItemsProvider<VehicleActivity>()
                 .AddElsa(elsa => elsa
-<<<<<<< Updated upstream
                     .UseEntityFrameworkPersistence(ef => ef.UseSqlite())
-=======
-                    .WithContainerName(Configuration["ContainerName"] ?? System.Environment.MachineName)
+                    //.WithContainerName(Configuration["ContainerName"] ?? System.Environment.MachineName)
                     //.UseEntityFrameworkPersistence(ef => ef.UseSqlite(sqliteConnectionString))
                     //.UseMongoDbPersistence(options => options.ConnectionString = mongoDbConnectionString)
                     //.UseYesSqlPersistence(config => config.UsePostgreSql("Server=localhost;Port=5432;Database=yessql5;User Id=root;Password=Password12!;"))
                     //.UseRabbitMq(Configuration.GetConnectionString("RabbitMq"))
-                    .UseRebusCacheSignal()
+                    //.UseRebusCacheSignal()
                     //.UseRedisCacheSignal()
->>>>>>> Stashed changes
                     .AddConsoleActivities()
                     .AddHttpActivities(elsaSection.GetSection("Http").Bind)
                     .AddEmailActivities(elsaSection.GetSection("Smtp").Bind)