From 398dbdf8297db48a77ba216558b4452897b488cb Mon Sep 17 00:00:00 2001
From: TJ Durnford <tjdford@gmail.com>
Date: Wed, 6 May 2020 18:51:46 -0600
Subject: [PATCH 1/2] fix: Copy skill manifests to the correct directory in the
 localPublish plugin (#2932)

---
 Composer/plugins/localPublish/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/plugins/localPublish/src/index.ts b/Composer/plugins/localPublish/src/index.ts
index 2297f2eda5..a6dbc17959 100644
--- a/Composer/plugins/localPublish/src/index.ts
+++ b/Composer/plugins/localPublish/src/index.ts
@@ -127,7 +127,7 @@ class LocalPublisher implements PublishPlugin<PublishConfig> {
 
   private getManifestSrcDir = (srcDir: string) => path.resolve(srcDir, 'manifests');
 
-  private getManifestDstDir = (botId: string) => path.resolve(this.getBotRuntimeDir(botId), 'wwwroot', 'manifests');
+  private getManifestDstDir = (botId: string) => path.resolve(this.getBotRuntimeDir(botId), 'azurewebapp', 'wwwroot', 'manifests');
 
   private getDownloadPath = (botId: string, version: string) =>
     path.resolve(this.getHistoryDir(botId), `${version}.zip`);

From 57d9e5394af8c7935a56093e381c917cebfc624b Mon Sep 17 00:00:00 2001
From: zeye <2295905420@qq.com>
Date: Thu, 7 May 2020 23:16:00 +0800
Subject: [PATCH 2/2] fix: improper visual node content in SetProperty /
 SetProperties (#2936)

---
 .../src/schema/defaultFlowSchema.tsx          | 14 ++------
 .../src/components/PropertyAssignment.tsx     | 34 +++++++++++++++++++
 .../lib/ui-shared/src/components/index.ts     |  1 +
 3 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 Composer/packages/lib/ui-shared/src/components/PropertyAssignment.tsx

diff --git a/Composer/packages/extensions/visual-designer/src/schema/defaultFlowSchema.tsx b/Composer/packages/extensions/visual-designer/src/schema/defaultFlowSchema.tsx
index 2999470f68..d88e52c25d 100644
--- a/Composer/packages/extensions/visual-designer/src/schema/defaultFlowSchema.tsx
+++ b/Composer/packages/extensions/visual-designer/src/schema/defaultFlowSchema.tsx
@@ -6,7 +6,7 @@ import formatMessage from 'format-message';
 import React from 'react';
 import get from 'lodash/get';
 import { FlowSchema, FlowWidget } from '@bfc/extension';
-import { FixedInfo, SingleLineDiv, ListOverview } from '@bfc/ui-shared';
+import { FixedInfo, SingleLineDiv, ListOverview, PropertyAssignment } from '@bfc/ui-shared';
 
 import { ObiColors } from '../constants/ElementColors';
 
@@ -130,7 +130,7 @@ export const defaultFlowSchema: FlowSchema = {
   },
   [SDKKinds.SetProperty]: {
     widget: 'ActionCard',
-    body: data => `${data.property || '?'} : ${data.value || '?'}`,
+    body: data => <PropertyAssignment property={data.property} value={data.value} />,
   },
   [SDKKinds.SetProperties]: {
     widget: 'ActionCard',
@@ -138,15 +138,7 @@ export const defaultFlowSchema: FlowSchema = {
       <ListOverview
         items={data.assignments}
         itemPadding={8}
-        renderItem={({ property, value }) => {
-          const v = typeof value === 'object' ? JSON.stringify(value) : value;
-          const content = `${property} : ${v}`;
-          return (
-            <SingleLineDiv height={16} title={content}>
-              {content}
-            </SingleLineDiv>
-          );
-        }}
+        renderItem={({ property, value }) => <PropertyAssignment property={property} value={value} />}
       />
     ),
   },
diff --git a/Composer/packages/lib/ui-shared/src/components/PropertyAssignment.tsx b/Composer/packages/lib/ui-shared/src/components/PropertyAssignment.tsx
new file mode 100644
index 0000000000..967d658a4e
--- /dev/null
+++ b/Composer/packages/lib/ui-shared/src/components/PropertyAssignment.tsx
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import React, { FC } from 'react';
+
+import { SingleLineDiv } from '../styled';
+
+type Expression = string;
+type AssignmentValue = string | number | boolean | Expression | object | any[];
+
+export interface PropertyAssignmentProps {
+  property: string;
+  value?: AssignmentValue;
+}
+
+const AssignmentOpt = ':';
+const NullValuePlaceholder = '?';
+
+const serializeAssignmentValue = (value?: AssignmentValue): string | number | boolean => {
+  if (typeof value === 'object') {
+    return JSON.stringify(value);
+  }
+  return value ?? NullValuePlaceholder;
+};
+
+export const PropertyAssignment: FC<PropertyAssignmentProps> = ({ property, value }) => {
+  const valueStr = serializeAssignmentValue(value);
+  const content = `${property} ${AssignmentOpt} ${valueStr}`;
+  return (
+    <SingleLineDiv height={16} title={content}>
+      {content}
+    </SingleLineDiv>
+  );
+};
diff --git a/Composer/packages/lib/ui-shared/src/components/index.ts b/Composer/packages/lib/ui-shared/src/components/index.ts
index df449296df..a0ab7d5a12 100644
--- a/Composer/packages/lib/ui-shared/src/components/index.ts
+++ b/Composer/packages/lib/ui-shared/src/components/index.ts
@@ -2,3 +2,4 @@
 // Licensed under the MIT License.
 
 export * from './ListOverview';
+export * from './PropertyAssignment';