From d8d3e8cf70c7225daa554890dd36fe961ce8b5e9 Mon Sep 17 00:00:00 2001
From: Oleksii Yaremenko <alex.g.yaremenko@gmail.com>
Date: Fri, 7 Apr 2023 17:08:05 +0200
Subject: [PATCH] fix: compatibility fixes & view models classes refactoring

---
 .../BuildProcessing/IncrementBuildNumber.cs   |  5 +-
 .../BuildPipeline/Core/BuildProcessor.cs      |  2 +-
 .../Core/DefaultBuildTasksProvider.cs         |  2 +-
 .../Interfaces/Main/IBuildTasksContainer.cs   |  8 +--
 .../Interfaces/Main/IBuildTasksProvider.cs    |  2 +-
 .../Interfaces/Tasks/Async/IAsyncBuildTask.cs |  2 +-
 .../Models/BuildTasksContainer.cs             | 16 ++---
 .../BuildPipelineTab/BuildPipelineTab.cs      | 20 +++---
 .../BuildPipelineTab/BuildPipelineTab.uss     |  4 +-
 .../BuildPipelineTab/BuildPipelineTab.uxml    | 24 +++----
 ... => DefaultBuildTasksViewModelProvider.cs} | 72 +++++++++----------
 ...efaultBuildTasksViewModelProvider.cs.meta} |  0
 .../IBuildStepsViewModelProvider.cs           |  2 +-
 ...cs => UnityBuildTasksViewModelProvider.cs} |  6 +-
 ... UnityBuildTasksViewModelProvider.cs.meta} |  0
 15 files changed, 84 insertions(+), 81 deletions(-)
 rename com.stansassets.build/BuildPipeline/ViewModels/{DefaultBuildStepsViewModelProvider.cs => DefaultBuildTasksViewModelProvider.cs} (87%)
 rename com.stansassets.build/BuildPipeline/ViewModels/{DefaultBuildStepsViewModelProvider.cs.meta => DefaultBuildTasksViewModelProvider.cs.meta} (100%)
 rename com.stansassets.build/BuildPipeline/ViewModels/{UnityBuildStepsViewModelProvider.cs => UnityBuildTasksViewModelProvider.cs} (94%)
 rename com.stansassets.build/BuildPipeline/ViewModels/{UnityBuildStepsViewModelProvider.cs.meta => UnityBuildTasksViewModelProvider.cs.meta} (100%)

diff --git a/com.stansassets.build/BuildMetadata/Editor/BuildProcessing/IncrementBuildNumber.cs b/com.stansassets.build/BuildMetadata/Editor/BuildProcessing/IncrementBuildNumber.cs
index 26b882f..89b88e7 100644
--- a/com.stansassets.build/BuildMetadata/Editor/BuildProcessing/IncrementBuildNumber.cs
+++ b/com.stansassets.build/BuildMetadata/Editor/BuildProcessing/IncrementBuildNumber.cs
@@ -84,7 +84,10 @@ static void SaveBuildMetadata(BuildMetadata buildMetadata, BuildTarget buildTarg
             var buildNumber = 0;
             if (versionsSheet == null)
             {
-                spreadsheet.CreateGoogleSheet(sheetName);
+                spreadsheet.CreateGoogleSheet(new GoogleSheet.SheetProperties
+                {
+                    Title = sheetName
+                });
                 spreadsheet.AppendGoogleCell(rangeAppend, s_Headers);
                 if (spreadsheet.SyncErrorMassage != null)
                 {
diff --git a/com.stansassets.build/BuildPipeline/Core/BuildProcessor.cs b/com.stansassets.build/BuildPipeline/Core/BuildProcessor.cs
index fd14d93..5b121e3 100644
--- a/com.stansassets.build/BuildPipeline/Core/BuildProcessor.cs
+++ b/com.stansassets.build/BuildPipeline/Core/BuildProcessor.cs
@@ -63,7 +63,7 @@ static void RunBuildTask(IBuildContext buildContext, IBuildTask task)
             }
         }
 
-        public static IBuildTasksContainer GenerateBuildStepsContainer()
+        public static IBuildTasksContainer GenerateBuildTasksContainer()
         {
             var tasksProvider = CreateBuildTasksProvider();
             return tasksProvider.GetBuildTasks(new UserEditorBuildSettings());
diff --git a/com.stansassets.build/BuildPipeline/Core/DefaultBuildTasksProvider.cs b/com.stansassets.build/BuildPipeline/Core/DefaultBuildTasksProvider.cs
index d4df8c1..c3597ff 100644
--- a/com.stansassets.build/BuildPipeline/Core/DefaultBuildTasksProvider.cs
+++ b/com.stansassets.build/BuildPipeline/Core/DefaultBuildTasksProvider.cs
@@ -6,7 +6,7 @@ namespace StansAssets.Build.Pipeline
 {
     class DefaultBuildTasksProvider : IBuildTasksProvider
     {
-        public IBuildTasksContainer GetBuildSteps(IUserEditorBuildSettings buildSettings)
+        public IBuildTasksContainer GetBuildTasks(IUserEditorBuildSettings buildSettings)
         {
             var tasksContainer = new BuildTasksContainer();
 
diff --git a/com.stansassets.build/BuildPipeline/Interfaces/Main/IBuildTasksContainer.cs b/com.stansassets.build/BuildPipeline/Interfaces/Main/IBuildTasksContainer.cs
index 28c1c53..ffdd9b3 100644
--- a/com.stansassets.build/BuildPipeline/Interfaces/Main/IBuildTasksContainer.cs
+++ b/com.stansassets.build/BuildPipeline/Interfaces/Main/IBuildTasksContainer.cs
@@ -3,22 +3,22 @@
 namespace StansAssets.Build.Pipeline
 {
     /// <summary>
-    /// Provides build steps.
+    /// Provides build tasks.
     /// </summary>
     public interface IBuildTasksContainer
     {
         /// <summary>
-        /// Pre process build steps. Order matters.
+        /// Pre process build tasks. Order matters.
         /// </summary>
         IReadOnlyList<IBuildTask> PreBuildTasks { get; }
 
         /// <summary>
-        /// Post process build steps. Order matters.
+        /// Post process build tasks. Order matters.
         /// </summary>
         IReadOnlyList<IBuildTask> PostBuildTasks { get; }
 
         /// <summary>
-        /// Scene process build steps. Order matters.
+        /// Scene process build tasks. Order matters.
         /// </summary>
         IReadOnlyList<IScenePostProcessTask> ScenePostProcessTasks { get; }
     }
diff --git a/com.stansassets.build/BuildPipeline/Interfaces/Main/IBuildTasksProvider.cs b/com.stansassets.build/BuildPipeline/Interfaces/Main/IBuildTasksProvider.cs
index 8569115..44f4686 100644
--- a/com.stansassets.build/BuildPipeline/Interfaces/Main/IBuildTasksProvider.cs
+++ b/com.stansassets.build/BuildPipeline/Interfaces/Main/IBuildTasksProvider.cs
@@ -5,6 +5,6 @@ namespace StansAssets.Build.Pipeline
     /// </summary>
     public interface IBuildTasksProvider
     {
-        IBuildTasksContainer GetBuildSteps(IUserEditorBuildSettings buildSettings);
+        IBuildTasksContainer GetBuildTasks(IUserEditorBuildSettings buildSettings);
     }
 }
diff --git a/com.stansassets.build/BuildPipeline/Interfaces/Tasks/Async/IAsyncBuildTask.cs b/com.stansassets.build/BuildPipeline/Interfaces/Tasks/Async/IAsyncBuildTask.cs
index ae85e0b..0164980 100644
--- a/com.stansassets.build/BuildPipeline/Interfaces/Tasks/Async/IAsyncBuildTask.cs
+++ b/com.stansassets.build/BuildPipeline/Interfaces/Tasks/Async/IAsyncBuildTask.cs
@@ -3,7 +3,7 @@
 namespace StansAssets.Build.Pipeline
 {
     /// <summary>
-    /// Represents a single async build step.
+    /// Represents a single async build task.
     /// </summary>
     public interface IAsyncBuildTask : IBuildTask
     {
diff --git a/com.stansassets.build/BuildPipeline/Models/BuildTasksContainer.cs b/com.stansassets.build/BuildPipeline/Models/BuildTasksContainer.cs
index 0848d05..4df35e4 100644
--- a/com.stansassets.build/BuildPipeline/Models/BuildTasksContainer.cs
+++ b/com.stansassets.build/BuildPipeline/Models/BuildTasksContainer.cs
@@ -7,9 +7,9 @@ namespace StansAssets.Build.Pipeline
     /// </summary>
     public class BuildTasksContainer : IBuildTasksContainer
     {
-        readonly List<IBuildTask> m_PreBuildSteps;
-        readonly List<IBuildTask> m_PostBuildSteps;
-        readonly List<IScenePostProcessTask> m_ScenePostProcessStepsTasks;
+        readonly List<IBuildTask> m_PreBuildTasks;
+        readonly List<IBuildTask> m_PostBuildTasks;
+        readonly List<IScenePostProcessTask> m_ScenePostProcessTasks;
 
         public IReadOnlyList<IBuildTask> PreBuildTasks => m_PreBuildTasks;
         public IReadOnlyList<IBuildTask> PostBuildTasks => m_PostBuildTasks;
@@ -18,9 +18,9 @@ public class BuildTasksContainer : IBuildTasksContainer
         public BuildTasksContainer()
         {
 
-            m_PreBuildSteps = new List<IBuildTask>();
-            m_PostBuildSteps = new List<IBuildTask>();
-            m_ScenePostProcessStepsTasks = new List<IScenePostProcessTask>();
+            m_PreBuildTasks = new List<IBuildTask>();
+            m_PostBuildTasks = new List<IBuildTask>();
+            m_ScenePostProcessTasks = new List<IScenePostProcessTask>();
         }
 
         /// <summary>
@@ -33,7 +33,7 @@ public void AddPreProcessTask(IBuildTask task)
         }
 
         /// <summary>
-        /// Registers a post process build step.
+        /// Registers a post process build task.
         /// </summary>
         /// <param name="task">Task to be registered.</param>
         public void AddPostProcessTask(IBuildTask task)
@@ -42,7 +42,7 @@ public void AddPostProcessTask(IBuildTask task)
         }
 
         /// <summary>
-        /// Registers a post process scene step.
+        /// Registers a post process scene task.
         /// </summary>
         /// <param name="task">Task to be registered.</param>
         public void AddScenePostProcessTask(IScenePostProcessTask task)
diff --git a/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.cs b/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.cs
index 62bd70f..fdb8245 100644
--- a/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.cs
+++ b/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.cs
@@ -10,9 +10,9 @@ namespace StansAssets.Build.Pipeline
     [UsedImplicitly]
     class BuildPipelineTab : BaseTab, IBuildSystemWindowTab
     {
-        const string k_PreProcessStageBaseName = "preProcessSteps";
-        const string k_SceneProcessStageBaseName = "sceneProcessSteps";
-        const string k_PostProcessStageBaseName = "postProcessSteps";
+        const string k_PreProcessStageBaseName = "preProcessTasks";
+        const string k_SceneProcessStageBaseName = "sceneProcessTasks";
+        const string k_PostProcessStageBaseName = "postProcessTasks";
 
         readonly Label m_TasksProviderName;
 
@@ -26,19 +26,19 @@ class BuildPipelineTab : BaseTab, IBuildSystemWindowTab
         public BuildPipelineTab()
             : base($"{BuildPipelineSettings.WindowTabsPath}/{nameof(BuildPipelineTab)}/{nameof(BuildPipelineTab)}")
         {
-            m_StepsProviderName = this.Q<Label>("providerName");
-            m_StepsProviderName.AddToClassList("list-build-entity");
+            m_TasksProviderName = this.Q<Label>("providerName");
+            m_TasksProviderName.AddToClassList("list-build-entity");
 
-            var unityBuildStepsProvider = new UnityBuildStepsViewModelProvider();
-            var buildStepsProvider = new DefaultBuildStepsViewModelProvider();
+            var unityBuildTasksProvider = new UnityBuildTasksViewModelProvider();
+            var buildTasksProvider = new DefaultBuildTasksViewModelProvider();
 
-            SetBuildSteps(unityBuildStepsProvider.GetBuildSteps(), buildStepsProvider.GetBuildSteps());
+            SetBuildSteps(unityBuildTasksProvider.GetBuildSteps(), buildTasksProvider.GetBuildSteps());
             SetProvider(BuildProcessor.GetProviderName());
         }
 
         void SetProvider(string providerName)
         {
-            m_StepsProviderName.text = providerName;
+            m_TasksProviderName.text = providerName;
         }
         
         void SetBuildSteps(IBuildStepsViewModelContainer unityBuildStepsContainer, IBuildStepsViewModelContainer buildStepsContainer)
@@ -83,7 +83,7 @@ static void AddBuildSteps(VisualElement container, IEnumerable<BuildStepViewMode
 
             if (!buildSteps.Any())
             {
-                var label = new Label { text = "No Build Steps Defined" };
+                var label = new Label { text = "No Build Tasks Defined" };
                 label.AddToClassList("item-build-entity");
                 label.AddToClassList("italic");
                 container.Add(label);
diff --git a/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.uss b/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.uss
index 2dcc87e..89ab507 100644
--- a/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.uss
+++ b/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.uss
@@ -17,13 +17,13 @@
     margin: 3px;
 }
 
-.steps-provider {
+.tasks-provider {
     height: 20px;
     -unity-text-align: middle-left;
     padding-left: 5px;
 }
 
-.steps-help-box {
+.tasks-help-box {
     padding-left: 5px;
     padding-right: 5px;
 }
diff --git a/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.uxml b/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.uxml
index 6abf035..d6e736e 100644
--- a/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.uxml
+++ b/com.stansassets.build/BuildPipeline/UserInterface/BuildPipelineTab/BuildPipelineTab.uxml
@@ -3,23 +3,23 @@
 
     <sa:SettingsBlock label="Build Pipeline">
         <sa:HelpBox type="Info"
-                    class="steps-help-box"
-                    text="The actual execution order of steps with the same callback order may differ during the build process."/>
+                    class="tasks-help-box"
+                    text="The actual execution order of tasks with the same callback order may differ during the build process."/>
         
-        <ui:Label text="Preprocess Stage" name="labelBuildStep" class="label-build-entity"/>
-        <ui:VisualElement name="preProcessStepsBefore" class="list-unity-build-entity"/>
-        <ui:VisualElement name="preProcessSteps" class="list-build-entity"/>
-        <ui:VisualElement name="preProcessStepsAfter" class="list-unity-build-entity"/>
+        <ui:Label text="Preprocess Stage" name="labelBuildTask" class="label-build-entity"/>
+        <ui:VisualElement name="preProcessTasksBefore" class="list-unity-build-entity"/>
+        <ui:VisualElement name="preProcessTasks" class="list-build-entity"/>
+        <ui:VisualElement name="preProcessTasksAfter" class="list-unity-build-entity"/>
 
         <ui:Label text="Scenes Process Stage" name="labelBuildTask" class="label-build-entity"/>
-        <ui:VisualElement name="sceneProcessStepsBefore" class="list-unity-build-entity"/>
-        <ui:VisualElement name="sceneProcessSteps" class="list-build-entity"/>
-        <ui:VisualElement name="sceneProcessStepsAfter" class="list-unity-build-entity"/>
+        <ui:VisualElement name="sceneProcessTasksBefore" class="list-unity-build-entity"/>
+        <ui:VisualElement name="sceneProcessTasks" class="list-build-entity"/>
+        <ui:VisualElement name="sceneProcessTasksAfter" class="list-unity-build-entity"/>
 
         <ui:Label text="Postprocess Stage" name="labelBuildTask" class="label-build-entity"/>
-        <ui:VisualElement name="postProcessStepsBefore" class="list-unity-build-entity"/>
-        <ui:VisualElement name="postProcessSteps" class="list-build-entity"/>
-        <ui:VisualElement name="postProcessStepsAfter" class="list-unity-build-entity"/>
+        <ui:VisualElement name="postProcessTasksBefore" class="list-unity-build-entity"/>
+        <ui:VisualElement name="postProcessTasks" class="list-build-entity"/>
+        <ui:VisualElement name="postProcessTasksAfter" class="list-unity-build-entity"/>
     </sa:SettingsBlock>
 
     <sa:SettingsBlock label="Tasks Provider">
diff --git a/com.stansassets.build/BuildPipeline/ViewModels/DefaultBuildStepsViewModelProvider.cs b/com.stansassets.build/BuildPipeline/ViewModels/DefaultBuildTasksViewModelProvider.cs
similarity index 87%
rename from com.stansassets.build/BuildPipeline/ViewModels/DefaultBuildStepsViewModelProvider.cs
rename to com.stansassets.build/BuildPipeline/ViewModels/DefaultBuildTasksViewModelProvider.cs
index dba23a1..a8dc3b1 100644
--- a/com.stansassets.build/BuildPipeline/ViewModels/DefaultBuildStepsViewModelProvider.cs
+++ b/com.stansassets.build/BuildPipeline/ViewModels/DefaultBuildTasksViewModelProvider.cs
@@ -1,36 +1,36 @@
-using StansAssets.Build.Pipeline;
-
-namespace StansAssets.Build.Pipeline
-{
-    public class DefaultBuildStepsViewModelProvider : IBuildStepsViewModelProvider
-    {
-        public IBuildStepsViewModelContainer GetBuildSteps()
-        {
-            var provider = new DefaultBuildTasksProvider();
-            var container = new BuildStepsViewModelSortedContainer();
-            var callbackOrder = BuildProcessor.GetCallbackOrder();
-
-            var buildSteps = provider.GetBuildSteps(new UserEditorBuildSettings());
-
-            foreach (var preBuildStep in buildSteps.PreBuildTasks)
-            {
-                var step = new BuildStepViewModel(preBuildStep.GetType().FullName, callbackOrder);
-                container.AddPreBuildStep(step);
-            }
-
-            foreach (var sceneProcessStep in buildSteps.ScenePostProcessTasks)
-            {
-                var step = new BuildStepViewModel(sceneProcessStep.GetType().FullName, callbackOrder);
-                container.AddSceneProcessStep(step);
-            }
-
-            foreach (var postBuildStep in buildSteps.PostBuildTasks)
-            {
-                var step = new BuildStepViewModel(postBuildStep.GetType().FullName, callbackOrder);
-                container.AddSceneProcessStep(step);
-            }
-
-            return container;
-        }
-    }
-}
+using StansAssets.Build.Pipeline;
+
+namespace StansAssets.Build.Pipeline
+{
+    public class DefaultBuildTasksViewModelProvider : IBuildStepsViewModelProvider
+    {
+        public IBuildStepsViewModelContainer GetBuildSteps()
+        {
+            var provider = new DefaultBuildTasksProvider();
+            var container = new BuildStepsViewModelSortedContainer();
+            var callbackOrder = BuildProcessor.GetCallbackOrder();
+
+            var buildSteps = provider.GetBuildTasks(new UserEditorBuildSettings());
+
+            foreach (var preBuildStep in buildSteps.PreBuildTasks)
+            {
+                var step = new BuildStepViewModel(preBuildStep.GetType().FullName, callbackOrder);
+                container.AddPreBuildStep(step);
+            }
+
+            foreach (var sceneProcessStep in buildSteps.ScenePostProcessTasks)
+            {
+                var step = new BuildStepViewModel(sceneProcessStep.GetType().FullName, callbackOrder);
+                container.AddSceneProcessStep(step);
+            }
+
+            foreach (var postBuildStep in buildSteps.PostBuildTasks)
+            {
+                var step = new BuildStepViewModel(postBuildStep.GetType().FullName, callbackOrder);
+                container.AddSceneProcessStep(step);
+            }
+
+            return container;
+        }
+    }
+}
diff --git a/com.stansassets.build/BuildPipeline/ViewModels/DefaultBuildStepsViewModelProvider.cs.meta b/com.stansassets.build/BuildPipeline/ViewModels/DefaultBuildTasksViewModelProvider.cs.meta
similarity index 100%
rename from com.stansassets.build/BuildPipeline/ViewModels/DefaultBuildStepsViewModelProvider.cs.meta
rename to com.stansassets.build/BuildPipeline/ViewModels/DefaultBuildTasksViewModelProvider.cs.meta
diff --git a/com.stansassets.build/BuildPipeline/ViewModels/IBuildStepsViewModelProvider.cs b/com.stansassets.build/BuildPipeline/ViewModels/IBuildStepsViewModelProvider.cs
index 5f3da96..24c36cf 100644
--- a/com.stansassets.build/BuildPipeline/ViewModels/IBuildStepsViewModelProvider.cs
+++ b/com.stansassets.build/BuildPipeline/ViewModels/IBuildStepsViewModelProvider.cs
@@ -2,6 +2,6 @@
 {
     public interface IBuildStepsViewModelProvider
     {
-        public IBuildStepsViewModelContainer GetBuildSteps();
+        IBuildStepsViewModelContainer GetBuildSteps();
     }
 }
diff --git a/com.stansassets.build/BuildPipeline/ViewModels/UnityBuildStepsViewModelProvider.cs b/com.stansassets.build/BuildPipeline/ViewModels/UnityBuildTasksViewModelProvider.cs
similarity index 94%
rename from com.stansassets.build/BuildPipeline/ViewModels/UnityBuildStepsViewModelProvider.cs
rename to com.stansassets.build/BuildPipeline/ViewModels/UnityBuildTasksViewModelProvider.cs
index 0d3eb2a..8c1f6b4 100644
--- a/com.stansassets.build/BuildPipeline/ViewModels/UnityBuildStepsViewModelProvider.cs
+++ b/com.stansassets.build/BuildPipeline/ViewModels/UnityBuildTasksViewModelProvider.cs
@@ -9,18 +9,18 @@
 
 namespace StansAssets.Build.Pipeline
 {
-    public class UnityBuildStepsViewModelProvider : IBuildStepsViewModelProvider
+    public class UnityBuildTasksViewModelProvider : IBuildStepsViewModelProvider
     {
         public IBuildStepsViewModelContainer GetBuildSteps()
         {
             var stepsContainer = new BuildStepsViewModelSortedContainer();
 
-            CollectPreProcessSteps(stepsContainer);
+            CollectPreProcessTasks(stepsContainer);
 
             return stepsContainer;
         }
 
-        static void CollectPreProcessSteps(BuildStepsViewModelSortedContainer sortedContainer)
+        static void CollectPreProcessTasks(BuildStepsViewModelSortedContainer sortedContainer)
         {
             var preBuildStepsWithReport = CollectUnityBuildStepsWithReport<IPreprocessBuildWithReport>();
             var sceneProcessStepsWithReport = CollectUnityBuildStepsWithReport<IProcessSceneWithReport>();
diff --git a/com.stansassets.build/BuildPipeline/ViewModels/UnityBuildStepsViewModelProvider.cs.meta b/com.stansassets.build/BuildPipeline/ViewModels/UnityBuildTasksViewModelProvider.cs.meta
similarity index 100%
rename from com.stansassets.build/BuildPipeline/ViewModels/UnityBuildStepsViewModelProvider.cs.meta
rename to com.stansassets.build/BuildPipeline/ViewModels/UnityBuildTasksViewModelProvider.cs.meta