From 6ec6b6ce398f71930dc8b81e5f0fae71ad866673 Mon Sep 17 00:00:00 2001
From: Fraser Waters <fraser@pulumi.com>
Date: Tue, 25 Oct 2022 16:07:13 +0100
Subject: [PATCH 1/2] Add Json option to dotnet automation api

---
 sdk/Pulumi.Automation/UpdateOptions.cs  | 5 +++++
 sdk/Pulumi.Automation/WorkspaceStack.cs | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/sdk/Pulumi.Automation/UpdateOptions.cs b/sdk/Pulumi.Automation/UpdateOptions.cs
index db228947..4a85c707 100644
--- a/sdk/Pulumi.Automation/UpdateOptions.cs
+++ b/sdk/Pulumi.Automation/UpdateOptions.cs
@@ -66,5 +66,10 @@ public class UpdateOptions
         /// Print detailed debugging output during resource operations
         /// </summary>
         public bool? Debug { get; set; }
+
+        /// <summary>
+        /// Format standard output as JSON not text.
+        /// </summary>
+        public bool? Json { get; set; }
     }
 }
diff --git a/sdk/Pulumi.Automation/WorkspaceStack.cs b/sdk/Pulumi.Automation/WorkspaceStack.cs
index 13ed9d1f..d6a29b0f 100644
--- a/sdk/Pulumi.Automation/WorkspaceStack.cs
+++ b/sdk/Pulumi.Automation/WorkspaceStack.cs
@@ -800,6 +800,11 @@ static void ApplyUpdateOptions(UpdateOptions options, List<string> args)
             {
                 args.Add("--debug");
             }
+
+            if (options.Json is true)
+            {
+                args.Add("--json");
+            }
         }
     }
 }

From e21fbcddf4dd763285faf4b219d4b308329f7ea3 Mon Sep 17 00:00:00 2001
From: Zaid Ajaj <zaid.naom@gmail.com>
Date: Wed, 26 Oct 2022 17:07:31 +0200
Subject: [PATCH 2/2] Simplify the format of docs comment of Output<T>

---
 sdk/Pulumi/Core/Output.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sdk/Pulumi/Core/Output.cs b/sdk/Pulumi/Core/Output.cs
index ce074119..4523a7fa 100644
--- a/sdk/Pulumi/Core/Output.cs
+++ b/sdk/Pulumi/Core/Output.cs
@@ -128,11 +128,8 @@ internal interface IOutput
     /// <see cref="Output{T}"/>s are a key part of how Pulumi tracks dependencies between <see
     /// cref="Resource"/>s. Because the values of outputs are not available until resources are
     /// created, these are represented using the special <see cref="Output{T}"/>s type, which
-    /// internally represents two things:
-    /// <list type="number">
-    /// <item><description>An eventually available value of the output</description></item>
-    /// <item><description>The dependency on the source(s) of the output value</description></item>
-    /// </list>
+    /// internally represents two things: an eventually available value of the output and 
+    /// the dependency on the source(s) of the output value.
     /// In fact, <see cref="Output{T}"/>s is quite similar to <see cref="Task{TResult}"/>.
     /// Additionally, they carry along dependency information.
     /// <para/>