From 97a4c54460afe137b071f52be8e2e4ce72ef3802 Mon Sep 17 00:00:00 2001
From: Alexander Morogov <asmorogov@gmail.com>
Date: Thu, 25 Jan 2024 11:16:43 +0100
Subject: [PATCH 1/2] 3.21.0

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 866f24e..b0d1497 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,7 +6,7 @@
     <Copyright>Copyright © VirtoCommerce 2011-2022</Copyright>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>3.20.0</VersionPrefix>
+    <VersionPrefix>3.21.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

From 11007120cccbb3a5cb5d3ef156ff9a3bb0abd894 Mon Sep 17 00:00:00 2001
From: Alexandr Morogov <42555001+krankenbro@users.noreply.github.com>
Date: Tue, 20 Feb 2024 14:46:31 +0100
Subject: [PATCH 2/2] VCI-830: Minor fixes (#118)

---
 src/VirtoCommerce.Build/Cloud/Build.SaaS.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/VirtoCommerce.Build/Cloud/Build.SaaS.cs b/src/VirtoCommerce.Build/Cloud/Build.SaaS.cs
index 3b9fb6e..d12eb65 100644
--- a/src/VirtoCommerce.Build/Cloud/Build.SaaS.cs
+++ b/src/VirtoCommerce.Build/Cloud/Build.SaaS.cs
@@ -66,6 +66,9 @@ internal partial class Build
     [Parameter("Organization name", Name = "Organization")] public string SaaSOrganizationName { get; set; }
 
     public Target WaitForStatus => _ => _
+        .Executes(() => Log.Warning("Target WaitForStatus is obsolete. Use CloudEnvStatus."))
+        .Triggers(CloudEnvStatus);
+    public Target CloudEnvStatus => _ => _
         .Executes(async () =>
         {
             var isSuccess = false;
@@ -89,6 +92,10 @@ internal partial class Build
         });
 
     public Target SetEnvParameter => _ => _
+        .Executes(() => Log.Warning("Target SetEnvParameter is obsolete. Use CloudEnvSetParameter."))
+        .Triggers(CloudEnvSetParameter);
+
+    public Target CloudEnvSetParameter => _ => _
         .Executes(async () =>
         {
             var cloudClient = new VirtoCloudClient(CloudUrl, await GetCloudTokenAsync());
@@ -102,8 +109,11 @@ internal partial class Build
 
             await cloudClient.UpdateEnvironmentAsync(env);
         });
-
     public Target UpdateCloudEnvironment => _ => _
+        .Executes(() => Log.Warning("Target UpdateCloudEnvironment is obsolete. Use CloudEnvUpdate."))
+        .Triggers(CloudEnvUpdate);
+
+    public Target CloudEnvUpdate => _ => _
         .Executes(async () =>
         {
             var cloudClient = new VirtoCloudClient(CloudUrl, await GetCloudTokenAsync());
@@ -259,7 +269,6 @@ private static void CopyPlatformDirectory(AbsolutePath platformDirectory, Absolu
             var listener = new HttpListener() {
                 Prefixes = { listenerPrefix }
             };
-            Log.Information("Start listening to {0}", listenerPrefix);
             listener.Start();
 
 
@@ -270,7 +279,8 @@ private static void CopyPlatformDirectory(AbsolutePath platformDirectory, Absolu
             var context = await listener.GetContextAsync();
             context.Response.StatusCode = (int)HttpStatusCode.OK;
             var apiKey = context.Request.QueryString["apiKey"];
-            context.Response.Close(Encoding.UTF8.GetBytes("You can close this browser tab now."), false);
+            context.Response.Redirect($"{CloudUrl}/vcbuild/login/success");
+            context.Response.Close();
 
             SaveCloudToken(apiKey);
         });