Merge branch 'main' into vmodem/6963

microsoft · May 4, 2021 · f94a3c7 · f94a3c7
2 parents 194e029 + 8acc50e
commit f94a3c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/extensions/azurePublish/src/node/provision.ts b/extensions/azurePublish/src/node/provision.ts
@@ -333,6 +333,8 @@ export class BotProjectProvision {
               location: config.location ?? provisionResults.resourceGroup.location,
               name: config.hostname,
               workerRuntime: config.workerRuntime,
+              appId: provisionResults.appId,
+              appPwd: provisionResults.appPassword,
             });
             provisionResults.webApp = {
               hostname: functionsHostName,

diff --git a/extensions/runtimes/src/index.ts b/extensions/runtimes/src/index.ts
@@ -535,17 +535,7 @@ export default async (composer: any): Promise<void> => {
 
       // do the dotnet publish
       try {
-        const configuration = JSON.parse(profile.configuration);
-        const runtimeIdentifier = configuration.runtimeIdentifier;
-
-        // TODO: swap these lines??? ben to confirm
-        // Don't set self-contained and runtimeIdentifier for AzureFunctions.
-        // let buildCommand = `dotnet publish "${dotnetProjectPath}" -c release -o "${publishFolder}" -v q`;
-        // if runtime identifier set, make dotnet runtime to self contained, default runtime identifier is win-x64, please refer to https://docs.microsoft.com/en-us/dotnet/core/rid-catalog
-        const buildCommand = `dotnet publish "${dotnetProjectPath}" -c release -o "${publishFolder}" -v q --self-contained true -r ${
-          runtimeIdentifier ?? 'win-x64'
-        }`;
-        //  }
+        const buildCommand = `dotnet publish "${dotnetProjectPath}" -c release -o "${publishFolder}" -v q`;
         const { stdout, stderr } = await execAsync(buildCommand, {
           cwd: runtimePath,
         });