From f5962501bc05dbf3de8aca8ab5d2915263db68fa Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Mon, 27 Nov 2023 20:20:22 +0100
Subject: [PATCH] Update targets

---
 docker/Dockerfile                             |  4 +--
 .../Elsa.AllInOne.Web.csproj                  |  4 +--
 .../Elsa.WorkflowServer.Web.csproj            | 30 +++++++++----------
 .../ElsaStudioWebAssembly.csproj              | 21 +++++++++----
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index abff3e19f..b6ca2fec9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,10 +25,10 @@ RUN dotnet restore "./src/bundles/Elsa.AllInOne.Web/Elsa.AllInOne.Web.csproj"
 # build and publish (UseAppHost=false creates platform independent binaries)
 WORKDIR /source/src/bundles/Elsa.AllInOne.Web
 RUN dotnet build "Elsa.AllInOne.Web.csproj" -c Release -o /app/build
-RUN dotnet publish "Elsa.AllInOne.Web.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net7.0
+RUN dotnet publish "Elsa.AllInOne.Web.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -f net8.0
 
 # move binaries into smaller base image
-FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim AS base
 WORKDIR /app
 COPY --from=build /app/publish ./
 
diff --git a/src/bundles/Elsa.AllInOne.Web/Elsa.AllInOne.Web.csproj b/src/bundles/Elsa.AllInOne.Web/Elsa.AllInOne.Web.csproj
index 3ac5c9b6d..7c24b3a8f 100644
--- a/src/bundles/Elsa.AllInOne.Web/Elsa.AllInOne.Web.csproj
+++ b/src/bundles/Elsa.AllInOne.Web/Elsa.AllInOne.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -20,7 +20,7 @@
         <ProjectReference Include="..\..\modules\Elsa.Quartz\Elsa.Quartz.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.Webhooks\Elsa.Webhooks.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.Workflows.Api\Elsa.Workflows.Api.csproj"/>
-        <ProjectReference Include="..\ElsaStudioWebAssembly\ElsaStudioWebAssembly.csproj" />
+        <ProjectReference Include="..\ElsaStudioWebAssembly\ElsaStudioWebAssembly.csproj"/>
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">
diff --git a/src/bundles/Elsa.WorkflowServer.Web/Elsa.WorkflowServer.Web.csproj b/src/bundles/Elsa.WorkflowServer.Web/Elsa.WorkflowServer.Web.csproj
index df5ff1a6b..9cc124c10 100644
--- a/src/bundles/Elsa.WorkflowServer.Web/Elsa.WorkflowServer.Web.csproj
+++ b/src/bundles/Elsa.WorkflowServer.Web/Elsa.WorkflowServer.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -9,17 +9,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\common\Elsa.DropIns\Elsa.DropIns.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.Alterations.MassTransit\Elsa.Alterations.MassTransit.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.Alterations\Elsa.Alterations.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.CSharp\Elsa.CSharp.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.EntityFrameworkCore.Sqlite\Elsa.EntityFrameworkCore.Sqlite.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.EntityFrameworkCore.SqlServer\Elsa.EntityFrameworkCore.SqlServer.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.MassTransit.AzureServiceBus\Elsa.MassTransit.AzureServiceBus.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.MassTransit.RabbitMq\Elsa.MassTransit.RabbitMq.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.Python\Elsa.Python.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.Quartz.EntityFrameworkCore.Sqlite\Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.FileStorage\Elsa.FileStorage.csproj" />
+        <ProjectReference Include="..\..\common\Elsa.DropIns\Elsa.DropIns.csproj"/>
+        <ProjectReference Include="..\..\modules\Elsa.Alterations.MassTransit\Elsa.Alterations.MassTransit.csproj"/>
+        <ProjectReference Include="..\..\modules\Elsa.Alterations\Elsa.Alterations.csproj"/>
+        <ProjectReference Include="..\..\modules\Elsa.CSharp\Elsa.CSharp.csproj"/>
+        <ProjectReference Include="..\..\modules\Elsa.EntityFrameworkCore.Sqlite\Elsa.EntityFrameworkCore.Sqlite.csproj"/>
+        <ProjectReference Include="..\..\modules\Elsa.EntityFrameworkCore.SqlServer\Elsa.EntityFrameworkCore.SqlServer.csproj"/>
+        <ProjectReference Include="..\..\modules\Elsa.MassTransit.AzureServiceBus\Elsa.MassTransit.AzureServiceBus.csproj"/>
+        <ProjectReference Include="..\..\modules\Elsa.MassTransit.RabbitMq\Elsa.MassTransit.RabbitMq.csproj"/>
+        <ProjectReference Include="..\..\modules\Elsa.Python\Elsa.Python.csproj"/>
+        <ProjectReference Include="..\..\modules\Elsa.Quartz.EntityFrameworkCore.Sqlite\Elsa.Quartz.EntityFrameworkCore.Sqlite.csproj"/>
+        <ProjectReference Include="..\..\modules\Elsa.FileStorage\Elsa.FileStorage.csproj"/>
         <ProjectReference Include="..\Elsa\Elsa.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.Dapper.Migrations\Elsa.Dapper.Migrations.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.Dapper\Elsa.Dapper.csproj"/>
@@ -44,13 +44,13 @@
 
     <ItemGroup>
         <PackageReference Include="Azure.Identity" Version="1.10.4"/>
-        <PackageReference Include="FluentStorage.Azure.Blobs" Version="5.2.2" />
+        <PackageReference Include="FluentStorage.Azure.Blobs" Version="5.2.2"/>
         <PackageReference Include="Proto.Persistence.Sqlite" Version="1.4.0"/>
         <PackageReference Include="Proto.Persistence.SqlServer" Version="1.4.0"/>
     </ItemGroup>
 
     <ItemGroup>
-      <Folder Include="App_Data\" />
+        <Folder Include="App_Data\"/>
     </ItemGroup>
-    
+
 </Project>
diff --git a/src/bundles/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj b/src/bundles/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj
index d86e94ede..b09b24518 100644
--- a/src/bundles/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj
+++ b/src/bundles/ElsaStudioWebAssembly/ElsaStudioWebAssembly.csproj
@@ -1,22 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Elsa.Studio" Version="3.0.0-preview.148" />
-        <PackageReference Include="Elsa.Studio.Core.BlazorWasm" Version="3.0.0-preview.148" />
-        <PackageReference Include="Elsa.Studio.Login.BlazorWasm" Version="3.0.0-preview.148" />
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0'">
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" PrivateAssets="all"/>
+        <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0"/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0"/>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all"/>
         <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-      <_ContentIncludedByDefault Remove="wwwroot\index.html" />
+        <PackageReference Include="Elsa.Studio" Version="3.0.0-preview.148"/>
+        <PackageReference Include="Elsa.Studio.Core.BlazorWasm" Version="3.0.0-preview.148"/>
+        <PackageReference Include="Elsa.Studio.Login.BlazorWasm" Version="3.0.0-preview.148"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <_ContentIncludedByDefault Remove="wwwroot\index.html"/>
     </ItemGroup>
 
 </Project>