Merge branch 'main' into azurepublish

microsoft · Oct 19, 2020 · d0ba695 · d0ba695
2 parents 4e6b980 + 075b6a9
commit d0ba695
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Composer/packages/server/src/models/bot/botProject.ts b/Composer/packages/server/src/models/bot/botProject.ts
@@ -152,19 +152,19 @@ export class BotProject implements IBotProject {
   }
 
   public get schema() {
-    return this.files.get('sdk.schema');
+    return this.files.get('app.schema') ?? this.files.get('sdk.schema');
   }
 
   public get uiSchema() {
-    return this.files.get('sdk.uischema');
+    return this.files.get('app.uischema') ?? this.files.get('sdk.uischema');
   }
 
   public get uiSchemaOverrides() {
-    return this.files.get('sdk.override.uischema');
+    return this.files.get('app.override.uischema') ?? this.files.get('sdk.override.uischema');
   }
 
   public get schemaOverrides() {
-    return this.files.get('sdk.override.schema');
+    return this.files.get('app.override.schema') ?? this.files.get('sdk.override.schema');
   }
 
   public getFile(id: string) {
@@ -736,6 +736,10 @@ export class BotProject implements IBotProject {
       'sdk.override.uischema',
       'sdk.schema',
       'sdk.uischema',
+      'app.override.schema',
+      'app.override.uischema',
+      'app.schema',
+      'app.uischema',
       '*.botproj',
     ];
     for (const pattern of patterns) {