fix: unify runtime path from ejecting

microsoft · Mar 23, 2021 · 245616e · 245616e
1 parent 294514f
commit 245616e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Composer/packages/server/src/models/bot/botProject.ts b/Composer/packages/server/src/models/bot/botProject.ts
@@ -48,6 +48,8 @@ const oauthInput = () => ({
 
 const defaultLanguage = 'en-us'; // default value for settings.defaultLanguage
 
+const isUsingAdaptiveRuntime = (runtime?: DialogSetting['runtime']): boolean =>
+  runtime?.key === 'csharp-azurewebapp-v2' || runtime?.key === 'adaptive-runtime-dotnet-webapp';
 export class BotProject implements IBotProject {
   public ref: LocationRef;
   // TODO: address need to instantiate id - perhaps do so in constructor based on Store.get(projectLocationMap)
@@ -200,8 +202,11 @@ export class BotProject implements IBotProject {
    */
   public getRuntimePath = (): string | undefined => {
     let runtimePath = this.settings?.runtime?.path;
+
     if (runtimePath && !Path.isAbsolute(runtimePath)) {
-      runtimePath = Path.resolve(this.dir, 'settings', runtimePath);
+      const dir = isUsingAdaptiveRuntime(this.settings?.runtime) ? Path.resolve(this.dir, 'settings') : this.dir;
+
+      runtimePath = Path.resolve(dir, runtimePath);
     }
     return runtimePath;
   };

diff --git a/extensions/runtimes/src/index.ts b/extensions/runtimes/src/index.ts
@@ -165,7 +165,7 @@ export default async (composer: any): Promise<void> => {
         await copyDir(schemaSrcPath, localDisk, schemaDstPath, project.fileStorage, pathsToExclude);
         const schemaFolderInRuntime = path.join(destPath, 'azurewebapp/Schemas');
         await removeDirAndFiles(schemaFolderInRuntime);
-        return path.relative(path.join(project.dir, 'settings'), destPath);
+        return path.relative(project.dir, destPath);
       }
       throw new Error(`Runtime already exists at ${destPath}`);
     },