From 2164ad385fd9a1c125e1a723b034cf98d58d74c9 Mon Sep 17 00:00:00 2001
From: Stepan Houdek <stepan.houdek@networg.com>
Date: Wed, 13 Nov 2024 13:19:57 +0100
Subject: [PATCH 1/4] Add: Settings.props

---
 src/Dataverse/MSBuildTasks/Props/Settings.props              | 5 +++++
 .../MSBuildTasks/TALXIS.DevKit.Build.Dataverse.Tasks.targets | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 src/Dataverse/MSBuildTasks/Props/Settings.props

diff --git a/src/Dataverse/MSBuildTasks/Props/Settings.props b/src/Dataverse/MSBuildTasks/Props/Settings.props
new file mode 100644
index 0000000..a4b1797
--- /dev/null
+++ b/src/Dataverse/MSBuildTasks/Props/Settings.props
@@ -0,0 +1,5 @@
+<Project>
+    <PropertyGroup>
+        <ApplyVersionNumberToSource Condition="'$(ApplyVersionNumberToSource)' == ''">false</ApplyVersionNumberToSource>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Dataverse/MSBuildTasks/TALXIS.DevKit.Build.Dataverse.Tasks.targets b/src/Dataverse/MSBuildTasks/TALXIS.DevKit.Build.Dataverse.Tasks.targets
index fa932e9..5241cdc 100644
--- a/src/Dataverse/MSBuildTasks/TALXIS.DevKit.Build.Dataverse.Tasks.targets
+++ b/src/Dataverse/MSBuildTasks/TALXIS.DevKit.Build.Dataverse.Tasks.targets
@@ -4,6 +4,7 @@
   </PropertyGroup>
   <Import Project="..\..\props\ProjectPaths.props" />
   <Import Project="..\..\props\SolutionFileItems.props" />
+  <Import Project="..\..\props\Settings.props" />
   <Import Project=".\$(MSBuildThisFileName).tasks" />
   <Import Project="..\..\targets\*.targets" />
 </Project>
\ No newline at end of file

From 796e401fae76ecac6189882aa3edd40c3c10c88c Mon Sep 17 00:00:00 2001
From: Stepan Houdek <stepan.houdek@networg.com>
Date: Wed, 13 Nov 2024 13:20:09 +0100
Subject: [PATCH 2/4] Add: Intermediate folder paths

---
 src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props b/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props
index 39f6182..503632a 100644
--- a/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props
+++ b/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props
@@ -14,7 +14,7 @@
         <EntityRelationships Include="$(DataverseSolutionSourceFolderFullPath)\Other\Relationships\*.xml"/>
         <OptionSets Include="$(DataverseSolutionSourceFolderFullPath)\OptionSets\**\*.xml"/>
         <SavedQueries Include="$(DataverseSolutionSourceFolderFullPath)\Entities\*\SavedQueries\*.xml" />
-        <WorkflowMetadata Include="$(DataverseSolutionSourceFolderFullPath)\Workflows\*.xaml"/>
+        <WorkflowMetadata Include="$(DataverseSolutionSourceFolderFullPath)\Workflows\**\*.xaml"/>
         <SdkMessageProcessingSteps Include="$(DataverseSolutionSourceFolderFullPath)\SdkMessageProcessingSteps\*.xml"/>
         <WorkflowMetadataFiles Include="$(DataverseSolutionSourceFolderFullPath)\Workflows\*.data.xml"/>
         <PluginAssemblyMetadataFiles Include="$(DataverseSolutionSourceFolderFullPath)\PluginAssemblies\**\*.dll.data.xml"/>
@@ -26,4 +26,11 @@
         <EnvironmentVariables Include="$(DataverseSolutionSourceFolderFullPath)\environmentvariabledefinitions\**\environmentvariabledefinition.xml"/>
         <ResxFiles Include="$(DataverseSolutionSourceFolderFullPath)\Resources\**\*.resx"/>
     </ItemGroup>
+    <ItemGroup>
+        <SolutionXmlIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\Other\Solution.xml"/>
+        <PluginAssemblyMetadataFilesIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\PluginAssemblies\**\*.dll.data.xml"/>
+        <WorkflowMetadataIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\Workflows\**\*.xaml"/>
+        <SdkMessageProcessingStepsIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\SdkMessageProcessingSteps\*.xml"/>
+        <CustomControlsIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\CustomControls"/>
+    </ItemGroup>
 </Project>
\ No newline at end of file

From 96ee1f4ac48d53c9c5ef720d430d8ca233653056 Mon Sep 17 00:00:00 2001
From: Stepan Houdek <stepan.houdek@networg.com>
Date: Wed, 13 Nov 2024 13:20:36 +0100
Subject: [PATCH 3/4] Update: Apply versions to intermediate or intermediate
 and source

---
 src/Dataverse/MSBuildTasks/Targets/ApplyVersionNumber.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Dataverse/MSBuildTasks/Targets/ApplyVersionNumber.targets b/src/Dataverse/MSBuildTasks/Targets/ApplyVersionNumber.targets
index 1715df5..074b79f 100644
--- a/src/Dataverse/MSBuildTasks/Targets/ApplyVersionNumber.targets
+++ b/src/Dataverse/MSBuildTasks/Targets/ApplyVersionNumber.targets
@@ -1,6 +1,7 @@
 <Project>
     <Target Name="ApplyVersionNumber">
         <Message Text="Updating version to $(Version) in all references..." Importance="high" />
-        <ApplyVersionNumber Version="$(Version)" SolutionXml="%(SolutionXml.FullPath)" PluginAssemblies="@(PluginAssemblies)" Workflows="@(WorkflowMetadata)" SdkMessageProcessingSteps="@(SdkMessageProcessingSteps)" CustomControlsFolder="$(SolutionPackagerMetadataWorkingDirectory)" />
+        <ApplyVersionNumber Version="$(Version)" SolutionXml="%(SolutionXmlIntermediateOutputPath.FullPath)" PluginAssemblies="@(PluginAssemblyMetadataFilesIntermediateOutputPath)" Workflows="@(WorkflowMetadataIntermediateOutputPath)" SdkMessageProcessingSteps="@(SdkMessageProcessingStepsIntermediateOutputPath)" CustomControlsFolder="$(SolutionPackagerMetadataWorkingDirectory)" />
+        <ApplyVersionNumber Condition="'$(ApplyVersionNumberToSource)' == 'true'" Version="$(Version)" SolutionXml="%(SolutionXml.FullPath)" PluginAssemblies="@(PluginAssemblyMetadataFiles)" Workflows="@(WorkflowMetadata)" SdkMessageProcessingSteps="@(SdkMessageProcessingSteps)" />
     </Target>
 </Project>
\ No newline at end of file

From 8410a376b70afc61c828bfcd1ad30979fa105e3b Mon Sep 17 00:00:00 2001
From: Stepan Houdek <stepan.houdek@networg.com>
Date: Wed, 13 Nov 2024 13:53:24 +0100
Subject: [PATCH 4/4] Remove: Nesting and unused item

---
 src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props b/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props
index 503632a..0ab61c0 100644
--- a/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props
+++ b/src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props
@@ -14,7 +14,7 @@
         <EntityRelationships Include="$(DataverseSolutionSourceFolderFullPath)\Other\Relationships\*.xml"/>
         <OptionSets Include="$(DataverseSolutionSourceFolderFullPath)\OptionSets\**\*.xml"/>
         <SavedQueries Include="$(DataverseSolutionSourceFolderFullPath)\Entities\*\SavedQueries\*.xml" />
-        <WorkflowMetadata Include="$(DataverseSolutionSourceFolderFullPath)\Workflows\**\*.xaml"/>
+        <WorkflowMetadata Include="$(DataverseSolutionSourceFolderFullPath)\Workflows\*.xaml"/>
         <SdkMessageProcessingSteps Include="$(DataverseSolutionSourceFolderFullPath)\SdkMessageProcessingSteps\*.xml"/>
         <WorkflowMetadataFiles Include="$(DataverseSolutionSourceFolderFullPath)\Workflows\*.data.xml"/>
         <PluginAssemblyMetadataFiles Include="$(DataverseSolutionSourceFolderFullPath)\PluginAssemblies\**\*.dll.data.xml"/>
@@ -31,6 +31,5 @@
         <PluginAssemblyMetadataFilesIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\PluginAssemblies\**\*.dll.data.xml"/>
         <WorkflowMetadataIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\Workflows\**\*.xaml"/>
         <SdkMessageProcessingStepsIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\SdkMessageProcessingSteps\*.xml"/>
-        <CustomControlsIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\CustomControls"/>
     </ItemGroup>
 </Project>
\ No newline at end of file