From cdf1ad8e980535cdafd279261bbf1176738d2d64 Mon Sep 17 00:00:00 2001
From: Thomas Farr <tsfarr@amazon.com>
Date: Wed, 14 Jun 2023 15:07:32 +1200
Subject: [PATCH] Bump Spectre.Console from 0.30.0 to 0.47.0 (#227)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
---
 src/ApiGenerator/ApiGenerator.csproj |  2 +-
 src/ApiGenerator/Program.cs          | 17 +++++++----------
 src/ApiGenerator/packages.lock.json  | 17 ++++++-----------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/ApiGenerator/ApiGenerator.csproj b/src/ApiGenerator/ApiGenerator.csproj
index 0c9d11077f..330adef566 100644
--- a/src/ApiGenerator/ApiGenerator.csproj
+++ b/src/ApiGenerator/ApiGenerator.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ShellProgressBar" Version="5.2.0" />
     <PackageReference Include="CsQuery.Core" Version="2.0.1" />
-    <PackageReference Include="Spectre.Console" Version="0.30.0" />
+    <PackageReference Include="Spectre.Console" Version="0.47.0" />
     <PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.20371.2" />
     <PackageReference Include="RazorLight" Version="2.1.0" />
     <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
diff --git a/src/ApiGenerator/Program.cs b/src/ApiGenerator/Program.cs
index 2adb8d357b..e64056addd 100644
--- a/src/ApiGenerator/Program.cs
+++ b/src/ApiGenerator/Program.cs
@@ -68,17 +68,14 @@ private static async Task<int> Main(
             catch (OperationCanceledException)
             {
                 AnsiConsole.WriteLine();
-                AnsiConsole.Render(new Rule("[b white on orange4_1] Cancelled [/]").LeftAligned());
+                AnsiConsole.Write(new Rule("[b white on orange4_1] Cancelled [/]").LeftJustified());
                 AnsiConsole.WriteLine();
                 return 1;
             }
             catch (Exception ex)
             {
                 AnsiConsole.WriteLine();
-                AnsiConsole.Render(new Rule("[b white on darkred] Exception [/]")
-                {
-                    Alignment = Justify.Left,
-                });
+                AnsiConsole.Write(new Rule("[b white on darkred] Exception [/]").LeftJustified());
                 AnsiConsole.WriteLine();
                 AnsiConsole.WriteException(ex);
                 return 1;
@@ -115,7 +112,7 @@ private static async Task<int> Generate(bool download, string branch, bool inclu
                 .AddRow("[b]Include high level client[/]", $"{YesNo(!lowLevelOnly)}");
 
             Console.WriteLine();
-            AnsiConsole.Render(
+            AnsiConsole.Write(
                 new Panel(grid)
                     .Header(new PanelHeader("[b white on chartreuse4] OpenSearch .NET client API generator [/]", Justify.Left))
             );
@@ -124,7 +121,7 @@ private static async Task<int> Generate(bool download, string branch, bool inclu
             if (redownloadCoreSpecification)
             {
                 Console.WriteLine();
-                AnsiConsole.Render(new Rule("[b white on chartreuse4] Downloading specification [/]").LeftAligned());
+                AnsiConsole.Write(new Rule("[b white on chartreuse4] Downloading specification [/]").LeftJustified());
                 Console.WriteLine();
                 await RestSpecDownloader.DownloadAsync(downloadBranch, token);
             }
@@ -132,7 +129,7 @@ private static async Task<int> Generate(bool download, string branch, bool inclu
             if (!generateCode) return 0;
 
             Console.WriteLine();
-            AnsiConsole.Render(new Rule("[b white on chartreuse4] Loading specification [/]").LeftAligned());
+            AnsiConsole.Write(new Rule("[b white on chartreuse4] Loading specification [/]").LeftJustified());
             Console.WriteLine();
 
             var spec = Generator.ApiGenerator.CreateRestApiSpecModel(downloadBranch, "Core");
@@ -148,7 +145,7 @@ private static async Task<int> Generate(bool download, string branch, bool inclu
             }
 
             Console.WriteLine();
-            AnsiConsole.Render(new Rule("[b white on chartreuse4] Generating code [/]").LeftAligned());
+            AnsiConsole.Write(new Rule("[b white on chartreuse4] Generating code [/]").LeftJustified());
             Console.WriteLine();
 
             await Generator.ApiGenerator.Generate(downloadBranch, lowLevelOnly, spec, token);
@@ -157,7 +154,7 @@ private static async Task<int> Generate(bool download, string branch, bool inclu
             if (warnings.Count > 0)
             {
                 Console.WriteLine();
-                AnsiConsole.Render(new Rule("[b black on yellow] Specification warnings [/]").LeftAligned());
+                AnsiConsole.Write(new Rule("[b black on yellow] Specification warnings [/]").LeftJustified());
                 Console.WriteLine();
 
                 foreach (var warning in warnings.Distinct().OrderBy(w => w))
diff --git a/src/ApiGenerator/packages.lock.json b/src/ApiGenerator/packages.lock.json
index 623306d514..9324a38065 100644
--- a/src/ApiGenerator/packages.lock.json
+++ b/src/ApiGenerator/packages.lock.json
@@ -65,11 +65,11 @@
       },
       "Spectre.Console": {
         "type": "Direct",
-        "requested": "[0.30.0, )",
-        "resolved": "0.30.0",
-        "contentHash": "7UG9p43sEJ2IjPuzkFNCE8zWmV1OOE0Kwh1jlJXv8/dzEADmWImzt9q868FCQ1ny5mDhNIkrZ3mfy2zxMSDagQ==",
+        "requested": "[0.47.0, )",
+        "resolved": "0.47.0",
+        "contentHash": "wz8mszcZr0cSOo8GyoG9e2DFW0SkMT8/n78Q/lIXX7EbCtHNXOoOKWpJ9Str+rCYtmQOGGyDutZzubrUHK/XkA==",
         "dependencies": {
-          "Wcwidth": "0.2.0"
+          "System.Memory": "4.5.5"
         }
       },
       "System.CommandLine.DragonFruit": {
@@ -305,8 +305,8 @@
       },
       "System.Memory": {
         "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
+        "resolved": "4.5.5",
+        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
       },
       "System.Reflection": {
         "type": "Transitive",
@@ -459,11 +459,6 @@
         "type": "Transitive",
         "resolved": "4.5.4",
         "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
-      },
-      "Wcwidth": {
-        "type": "Transitive",
-        "resolved": "0.2.0",
-        "contentHash": "H7no2W0vuLJTvSPanlrijtG3UdJNVoeWBOp2a5dJFVa2tqSQuP5GfbJw1xAtPG9agRW310nFTUUsyPz5tuVIxw=="
       }
     }
   }