From 1e95b6f8479494f992df10ea50c0853cff10c8ea Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Wed, 10 Jul 2024 15:05:31 +0200
Subject: [PATCH] Update ElsaStudio package version to use a variable

Switched ElsaStudio package versions to use a property variable for easier management and consistency. Also, adjusted the YAML workflow to tag Docker images with the specific version 3.2.0-rc3.
---
 .github/workflows/elsa-server-and-studio.yml |  2 +-
 Directory.Build.props                        | 46 ++++++++++----------
 Directory.Packages.props                     |  6 +--
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/elsa-server-and-studio.yml b/.github/workflows/elsa-server-and-studio.yml
index bd6c23243..07ac18c86 100644
--- a/.github/workflows/elsa-server-and-studio.yml
+++ b/.github/workflows/elsa-server-and-studio.yml
@@ -29,7 +29,7 @@ jobs:
         with:
           # list of Docker images to use as base name for tags
           images: |
-            elsaworkflows/elsa-server-and-studio-v3
+            elsaworkflows/elsa-server-and-studio-v3:3.2.0-rc3
           flavor: |
             latest=true
           # generate Docker tags based on the following events/attributes
diff --git a/Directory.Build.props b/Directory.Build.props
index adbd4a9e9..4c56d1528 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,30 +1,32 @@
 <Project>
-  <PropertyGroup>
-    <Authors>Elsa Workflows Community</Authors>
-    <Copyright>2023</Copyright> 
+    <PropertyGroup>
+        <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>
+        <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>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
 
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageIcon>icon.png</PackageIcon>
+        <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>
-      
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AnalysisModeDocumentation>Default</AnalysisModeDocumentation>
-    <AnalysisLevelDocumentation>latest</AnalysisLevelDocumentation>
+        <!-- For NuGet browsers that currently don't support <PackageIcon> yet -->
+        <PackageIconUrl>https://v3.elsaworkflows.io/nuget-icon.png</PackageIconUrl>
 
-    <!-- https://github.com/dotnet/sourcelink -->
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-  </PropertyGroup>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AnalysisModeDocumentation>Default</AnalysisModeDocumentation>
+        <AnalysisLevelDocumentation>latest</AnalysisLevelDocumentation>
 
+        <!-- https://github.com/dotnet/sourcelink -->
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    </PropertyGroup>
+    <PropertyGroup>
+        <ElsaStudioVersion>3.2.0-rc3.417</ElsaStudioVersion>
+    </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 581449a8e..0663c9b3e 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -23,9 +23,9 @@
     <PackageVersion Include="DistributedLock.Postgres" Version="1.1.0" />
     <PackageVersion Include="DistributedLock.Redis" Version="1.0.3" />
     <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.14.0" />
-    <PackageVersion Include="Elsa.Studio" Version="3.2.0-rc2.369" />
-    <PackageVersion Include="Elsa.Studio.Core.BlazorWasm" Version="3.2.0-rc2.369" />
-    <PackageVersion Include="Elsa.Studio.Login.BlazorWasm" Version="3.2.0-rc2.369" />
+    <PackageVersion Include="Elsa.Studio" Version="$(ElsaStudioVersion)" />
+    <PackageVersion Include="Elsa.Studio.Core.BlazorWasm" Version="$(ElsaStudioVersion)" />
+    <PackageVersion Include="Elsa.Studio.Login.BlazorWasm" Version="$(ElsaStudioVersion)" />
     <PackageVersion Include="FastEndpoints" Version="5.26.0" />
     <PackageVersion Include="FastEndpoints.Security" Version="5.26.0" />
     <PackageVersion Include="FastEndpoints.Swagger" Version="5.26.0" />