Shared check for using adaptive runtime (microsoft#6554)

lei9444 · Mar 25, 2021 · 078e66f · 078e66f
1 parent 90a49bc
commit 078e66f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Composer/packages/lib/shared/src/skillsUtils/index.ts b/Composer/packages/lib/shared/src/skillsUtils/index.ts
@@ -100,3 +100,6 @@ export const isLocalhostUrl = (matchUrl: string) => {
 export const isSkillHostUpdateRequired = (skillHostEndpoint?: string) => {
   return !skillHostEndpoint || isLocalhostUrl(skillHostEndpoint);
 };
+
+export const isUsingAdaptiveRuntime = (runtime?: DialogSetting['runtime']): boolean =>
+  runtime?.key === 'csharp-azurewebapp-v2' || !!runtime?.key?.startsWith('adaptive-runtime-');
diff --git a/Composer/packages/server/src/models/bot/botProject.ts b/Composer/packages/server/src/models/bot/botProject.ts
@@ -7,6 +7,7 @@ import fs from 'fs';
 import has from 'lodash/has';
 import axios from 'axios';
 import { autofixReferInDialog } from '@bfc/indexers';
+import { isUsingAdaptiveRuntime } from '@bfc/shared';
 import {
   getNewDesigner,
   FileInfo,
@@ -47,9 +48,6 @@ 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)

diff --git a/extensions/azurePublish/src/node/index.ts b/extensions/azurePublish/src/node/index.ts
@@ -14,6 +14,7 @@ import {
   PublishResponse,
   PublishResult,
 } from '@botframework-composer/types';
+import { isUsingAdaptiveRuntime } from '@bfc/shared';
 
 import { authConfig, ResourcesItem } from '../types';
 
@@ -190,7 +191,7 @@ export default async (composer: IExtensionRegistration): Promise<void> => {
         // include both pre-release and release identifiers here
         // TODO: eventually we can clean this up when the "old" runtime is deprecated
         // (old runtime support is the else block below)
-        if (runtime.key === 'csharp-azurewebapp-v2' || runtime.key === 'adaptive-runtime-dotnet-webapp') {
+        if (isUsingAdaptiveRuntime(runtime)) {
           const buildFolder = this.getProjectFolder(resourcekey, this.mode);
 
           // clean up from any previous deploys

diff --git a/extensions/azurePublish/src/node/luisAndQnA.ts b/extensions/azurePublish/src/node/luisAndQnA.ts
@@ -5,14 +5,12 @@ import * as path from 'path';
 
 import * as fs from 'fs-extra';
 import * as rp from 'request-promise';
+import { isUsingAdaptiveRuntime } from '@bfc/shared';
 import { ILuisConfig, FileInfo, IBotProject, RuntimeTemplate, DialogSetting } from '@botframework-composer/types';
 
 import { AzurePublishErrors } from './utils/errorHandler';
 import { BotProjectDeployLoggerType } from './types';
 
-const isUsingAdaptiveRuntime = (runtime?: DialogSetting['runtime']): boolean =>
-  runtime?.key === 'csharp-azurewebapp-v2' || runtime?.key === 'adaptive-runtime-dotnet-webapp';
-
 const botPath = (projPath: string, runtime?: DialogSetting['runtime']) =>
   isUsingAdaptiveRuntime(runtime) ? projPath : path.join(projPath, 'ComposerDialogs');