@microsoft/teamsfx-core 1.1.3-alpha.cef16e3d.0 → 1.2.0

package/templates/plugins/resource/bot/bicep/botProvision.template.bicep

@@ -3,15 +3,14 @@ param provisionParameters object
 param userAssignedIdentityId string
 
 var resourceBaseName = provisionParameters.resourceBaseName
-var botAadAppClientId = provisionParameters['botAadAppClientId'] // Read AAD app client id for Azure Bot Service from parameters
-var botServiceName = contains(provisionParameters, 'botServiceName') ? provisionParameters['botServiceName'] : '${resourceBaseName}' // Try to read name for Azure Bot Service from parameters
-var botServiceSku = contains(provisionParameters, 'botServiceSku') ? provisionParameters['botServiceSku'] : 'F0' // Try to read SKU for Azure Bot Service from parameters
-var botDisplayName = contains(provisionParameters, 'botDisplayName') ? provisionParameters['botDisplayName'] : '${resourceBaseName}' // Try to read display name for Azure Bot Service from parameters
-var serverfarmsName = contains(provisionParameters, 'botServerfarmsName') ? provisionParameters['botServerfarmsName'] : '${resourceBaseName}bot' // Try to read name for App Service Plan from parameters
-var webAppSKU = contains(provisionParameters, 'botWebAppSKU') ? provisionParameters['botWebAppSKU'] : 'F1' // Try to read SKU for Azure Web App from parameters
-var webAppName = contains(provisionParameters, 'botSitesName') ? provisionParameters['botSitesName'] : '${resourceBaseName}bot' // Try to read name for Azure Web App from parameters
+var botAadAppClientId = provisionParameters['botAadAppClientId']
+var botServiceName = contains(provisionParameters, 'botServiceName') ? provisionParameters['botServiceName'] : '${resourceBaseName}'
+var botServiceSku = contains(provisionParameters, 'botServiceSku') ? provisionParameters['botServiceSku'] : 'F0'
+var botDisplayName = contains(provisionParameters, 'botDisplayName') ? provisionParameters['botDisplayName'] : '${resourceBaseName}'
+var serverfarmsName = contains(provisionParameters, 'botServerfarmsName') ? provisionParameters['botServerfarmsName'] : '${resourceBaseName}bot'
+var webAppSKU = contains(provisionParameters, 'botWebAppSKU') ? provisionParameters['botWebAppSKU'] : 'F1'
+var webAppName = contains(provisionParameters, 'botSitesName') ? provisionParameters['botSitesName'] : '${resourceBaseName}bot'
 
-// Register your web service as a bot with the Bot Framework
 resource botService 'Microsoft.BotService/botServices@2021-03-01' = {
   kind: 'azurebot'
   location: 'global'
@@ -26,7 +25,6 @@ resource botService 'Microsoft.BotService/botServices@2021-03-01' = {
   }
 }
 
-// Connect the bot service to Microsoft Teams
 resource botServiceMsTeamsChannel 'Microsoft.BotService/botServices/channels@2021-03-01' = {
   parent: botService
   location: 'global'
@@ -36,7 +34,6 @@ resource botServiceMsTeamsChannel 'Microsoft.BotService/botServices/channels@202
   }
 }
 
-// Compute resources for your Web App
 resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
   kind: 'app'
   location: resourceGroup().location
@@ -46,23 +43,22 @@ resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
   }
 }
 
-// Web App that hosts your bot
 resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   kind: 'app'
   location: resourceGroup().location
   name: webAppName
   properties: {
     serverFarmId: serverfarm.id
-    keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    keyVaultReferenceIdentity: userAssignedIdentityId
     siteConfig: {
       appSettings: [
         {
           name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
-          value: 'true' // Execute build steps on your site during deployment
+          value: 'true'
         }
         {
           name: 'WEBSITE_NODE_DEFAULT_VERSION'
-          value: '~14' // Set NodeJS version to 14.x for your site
+          value: '~14'
         }
       ]
     }
@@ -70,7 +66,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   identity: {
     type: 'UserAssigned'
     userAssignedIdentities: {
-      '${userAssignedIdentityId}': {} // The identity is used to access other Azure resources
+      '${userAssignedIdentityId}': {}
     }
   }
 }

package/templates/plugins/resource/bot/bicep/config.template.bicep

@@ -1,7 +1,5 @@
-// Get existing app settings for merge
 var botCurrentAppSettings = list('${provisionOutputs.botOutput.value.botWebAppResourceId}/config/appsettings', '2021-02-01').properties
 
-// Merge TeamsFx configurations to Bot resources
 module teamsFxBotConfig '\{{fx-resource-bot.Configuration.bot.path}}' = {
   name: 'addTeamsFxBotConfiguration'
   params: {

package/templates/plugins/resource/frontend/bicep/frontendHostingProvision.bicep

@@ -1,10 +1,9 @@
 @secure()
 param provisionParameters object
 var resourceBaseName = provisionParameters.resourceBaseName
-var storageName = contains(provisionParameters, 'frontendHostingStorageName') ? provisionParameters['frontendHostingStorageName'] : '${resourceBaseName}tab' // Try to read name for frontend hosting Storage Account from parameters
-var storageSku = contains(provisionParameters, 'frontendHostingStorageSku') ? provisionParameters['frontendHostingStorageSku'] : 'Standard_LRS' // Try to read SKU for frontend hosting Storage Account from parameters
+var storageName = contains(provisionParameters, 'frontendHostingStorageName') ? provisionParameters['frontendHostingStorageName'] : '${resourceBaseName}tab'
+var storageSku = contains(provisionParameters, 'frontendHostingStorageSku') ? provisionParameters['frontendHostingStorageSku'] : 'Standard_LRS'
 
-// Azure Storage that hosts your static web site
 resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
   kind: 'StorageV2'
   location: resourceGroup().location

package/templates/plugins/resource/function/bicep/config.template.bicep

@@ -1,8 +1,6 @@
-// Get existing app settings and site config for merge
 var functionCurrentConfigs = reference('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/web', '2021-02-01')
 var functionCurrentAppSettings = list('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/appsettings', '2021-02-01').properties
 
-// Merge TeamsFx configurations to Azure Functions resources
 module teamsFxFunctionConfig '\{{fx-resource-function.Configuration.function.path}}' = {
   name: 'addTeamsFxFunctionConfiguration'
   params: {

package/templates/plugins/resource/function/bicep/functionConfiguration.template.bicep

@@ -60,7 +60,7 @@ resource appConfig 'Microsoft.Web/sites/config@2021-02-01' = {
   properties: {
     cors: {
       allowedOrigins: union(currentAllowedOrigins, [
-        tabAppEndpoint // allow requests from tab app
+        tabAppEndpoint
       ])
     }
   }
@@ -69,29 +69,29 @@ resource appConfig 'Microsoft.Web/sites/config@2021-02-01' = {
 resource appSettings 'Microsoft.Web/sites/config@2021-02-01' = {
   name: '${functionAppName}/appsettings'
   properties: union({
-    API_ENDPOINT: \{{fx-resource-function.References.functionEndpoint}} // Azure Functions endpoint
-    ALLOWED_APP_IDS: authorizedClientApplicationIds // Only allow tokens issued by these AAD applications
-    M365_CLIENT_ID: m365ClientId // Client id of AAD application
-    M365_CLIENT_SECRET: m365ClientSecret // Client secret of AAD application
-    M365_TENANT_ID: m365TenantId // Tenant id of AAD application
-    M365_AUTHORITY_HOST: m365OauthAuthorityHost // AAD authority host
-    M365_APPLICATION_ID_URI: m365ApplicationIdUri // Application ID URI of AAD application
-    IDENTITY_ID: \{{fx-resource-identity.References.identityClientId}} // User assigned identity id, the identity is used to access other Azure resources
+    API_ENDPOINT: \{{fx-resource-function.References.functionEndpoint}}
+    ALLOWED_APP_IDS: authorizedClientApplicationIds
+    M365_CLIENT_ID: m365ClientId
+    M365_CLIENT_SECRET: m365ClientSecret
+    M365_TENANT_ID: m365TenantId
+    M365_AUTHORITY_HOST: m365OauthAuthorityHost
+    M365_APPLICATION_ID_URI: m365ApplicationIdUri
+    IDENTITY_ID: \{{fx-resource-identity.References.identityClientId}}
     {{#if (contains "fx-resource-azure-sql" plugins) }}
-    SQL_DATABASE_NAME: \{{fx-resource-azure-sql.References.databaseName}} // SQL database name
-    SQL_ENDPOINT: \{{fx-resource-azure-sql.References.sqlEndpoint}} // SQL server endpoint
+    SQL_DATABASE_NAME: \{{fx-resource-azure-sql.References.databaseName}}
+    SQL_ENDPOINT: \{{fx-resource-azure-sql.References.sqlEndpoint}}
     {{/if}}
-  }, currentAppSettings) // Merge new settings with existing settings
+  }, currentAppSettings)
 }
 
 resource authSettings 'Microsoft.Web/sites/config@2021-02-01' = {
   name: '${functionAppName}/authsettings'
   properties: {
-    enabled: true // Validate access token in request authorization header
+    enabled: true
     defaultProvider: 'AzureActiveDirectory'
     clientId: m365ClientId
-    issuer: '${oauthAuthority}/v2.0' // Issuer of access token
-    allowedAudiences: [ // Only allow tokens with following audiences
+    issuer: '${oauthAuthority}/v2.0'
+    allowedAudiences: [
       m365ClientId
       m365ApplicationIdUri
     ]

package/templates/plugins/resource/function/bicep/functionProvision.template.bicep

@@ -3,13 +3,12 @@ param provisionParameters object
 param userAssignedIdentityId string
 
 var resourceBaseName = provisionParameters.resourceBaseName
-var serverfarmsName = contains(provisionParameters, 'functionServerfarmsName') ? provisionParameters['functionServerfarmsName'] : '${resourceBaseName}api' // Try to read name for App Service Plan from parameters
-var serverfarmsSku = contains(provisionParameters, 'functionServerfarmsSku') ? provisionParameters['functionServerfarmsSku'] : 'Y1' // Try to read SKU for App Service Plan from parameters
-var functionAppName = contains(provisionParameters, 'functionWebappName') ? provisionParameters['functionWebappName'] : '${resourceBaseName}api' // Try to read name for Azure Functions from parameters
-var storageName = contains(provisionParameters, 'functionStorageName') ? provisionParameters['functionStorageName'] : '${resourceBaseName}api' // Try to read name for Azure Storage from parameters
-var storageSku = contains(provisionParameters, 'functionStorageSku') ? provisionParameters['functionStorageSku'] : 'Standard_LRS' // Try to read SKU for Azure Storage from parameters
+var serverfarmsName = contains(provisionParameters, 'functionServerfarmsName') ? provisionParameters['functionServerfarmsName'] : '${resourceBaseName}api'
+var serverfarmsSku = contains(provisionParameters, 'functionServerfarmsSku') ? provisionParameters['functionServerfarmsSku'] : 'Y1'
+var functionAppName = contains(provisionParameters, 'functionWebappName') ? provisionParameters['functionWebappName'] : '${resourceBaseName}api'
+var storageName = contains(provisionParameters, 'functionStorageName') ? provisionParameters['functionStorageName'] : '${resourceBaseName}api'
+var storageSku = contains(provisionParameters, 'functionStorageSku') ? provisionParameters['functionStorageSku'] : 'Standard_LRS'
 
-// Compute resources for Azure Functions
 resource serverfarms 'Microsoft.Web/serverfarms@2021-02-01' = {
   name: serverfarmsName
   kind: 'functionapp'
@@ -19,43 +18,42 @@ resource serverfarms 'Microsoft.Web/serverfarms@2021-02-01' = {
   }
 }
 
-// Azure Functions that hosts your function code
 resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
   name: functionAppName
   kind: 'functionapp'
   location: resourceGroup().location
   properties: {
     serverFarmId: serverfarms.id
-    keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    keyVaultReferenceIdentity: userAssignedIdentityId
     siteConfig: {
       appSettings: [
         {
           name: 'AzureWebJobsDashboard'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
+          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}'
         }
         {
           name: 'AzureWebJobsStorage'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
+          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}'
         }
         {
           name: 'FUNCTIONS_EXTENSION_VERSION'
-          value: '~3' // Use Azure Functions runtime v3
+          value: '~3'
         }
         {
           name: 'FUNCTIONS_WORKER_RUNTIME'
-          value: 'node' // Set runtime to NodeJS
+          value: 'node'
         }
         {
           name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}' // Azure Functions internal setting
+          value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${listKeys(storage.id, storage.apiVersion).keys[0].value};EndpointSuffix=${environment().suffixes.storage}'
         }
         {
           name: 'WEBSITE_RUN_FROM_PACKAGE'
-          value: '1' // Run Azure Functions from a package file
+          value: '1'
         }
         {
           name: 'WEBSITE_NODE_DEFAULT_VERSION'
-          value: '~14' // Set NodeJS version to 14.x
+          value: '~14'
         }
       ]
     }
@@ -63,12 +61,11 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
   identity: {
     type: 'UserAssigned'
     userAssignedIdentities: {
-      '${userAssignedIdentityId}': {} // The identity is used to access other Azure resources
+      '${userAssignedIdentityId}': {}
     }
   }
 }
 
-// Azure Storage is required when creating Azure Functions instance
 resource storage 'Microsoft.Storage/storageAccounts@2021-06-01' = {
   name: storageName
   kind: 'StorageV2'

package/templates/plugins/resource/identity/bicep/identityProvision.template.bicep

@@ -1,9 +1,8 @@
 @secure()
 param provisionParameters object
 var resourceBaseName = provisionParameters.resourceBaseName
-var identityName = contains(provisionParameters, 'userAssignedIdentityName') ? provisionParameters['userAssignedIdentityName'] : '${resourceBaseName}' // Try to read name for user assigned identity from parameters
+var identityName = contains(provisionParameters, 'userAssignedIdentityName') ? provisionParameters['userAssignedIdentityName'] : '${resourceBaseName}'
 
-// user assigned identity will be used to access other Azure resources
 resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = {
   name: identityName
   location: resourceGroup().location

package/templates/plugins/resource/keyvault/bicep/keyVaultProvision.template.bicep

@@ -1,15 +1,15 @@
 @secure()
 param provisionParameters object
-param userAssignedIdentityObjectId string // User assigned identity that will be grant Key Vault access permission
+param userAssignedIdentityObjectId string
 
 var resourceBaseName = provisionParameters.resourceBaseName
-var keyVaultName = contains(provisionParameters, 'keyVaultName') ? provisionParameters['keyVaultName'] : '${resourceBaseName}' // Try to read name for Key Vault from parameters
+var keyVaultName = contains(provisionParameters, 'keyVaultName') ? provisionParameters['keyVaultName'] : '${resourceBaseName}'
 var tenantId = subscription().tenantId
-var m365ClientSecretName = 'm365ClientSecret' // Secret name of AAD app client secret
-var m365ClientSecret = provisionParameters['m365ClientSecret'] // Read AAD app client secret from parameters
-var botClientSecretName = 'botClientSecret' // Secret name of bot's AAD app client secret
-var botClientSecret = contains(provisionParameters, 'botAadAppClientSecret') ? provisionParameters['botAadAppClientSecret'] : '' // Try to read bot's AAD app client secret from parameters
-var keyVaultSkuName = contains(provisionParameters, 'keyVaultSkuName') ? provisionParameters['keyVaultSkuName'] : 'standard' // Try to read SKU for Key Vault from parameters
+var m365ClientSecretName = 'm365ClientSecret'
+var m365ClientSecret = provisionParameters['m365ClientSecret']
+var botClientSecretName = 'botClientSecret'
+var botClientSecret = contains(provisionParameters, 'botAadAppClientSecret') ? provisionParameters['botAadAppClientSecret'] : ''
+var keyVaultSkuName = contains(provisionParameters, 'keyVaultSkuName') ? provisionParameters['keyVaultSkuName'] : 'standard'
 
 resource keyVault 'Microsoft.KeyVault/vaults@2019-09-01' = {
   name: keyVaultName
@@ -34,7 +34,6 @@ resource keyVault 'Microsoft.KeyVault/vaults@2019-09-01' = {
   }
 }
 
-// Set or update AAD app client secret if it's not empty in parameters
 resource clientSecretKv 'Microsoft.KeyVault/vaults/secrets@2019-09-01' = if (length(m365ClientSecret) != 0) {
   parent: keyVault
   name: m365ClientSecretName
@@ -43,7 +42,6 @@ resource clientSecretKv 'Microsoft.KeyVault/vaults/secrets@2019-09-01' = if (len
   }
 }
 
-// Set or update bot's AAD app client secret if it's not empty in parameters
 resource botClientSecretKv 'Microsoft.KeyVault/vaults/secrets@2019-09-01' = if (length(botClientSecret) != 0) {
   parent: keyVault
   name: botClientSecretName

package/templates/plugins/resource/simpleauth/bicep/config.template.bicep

@@ -1,7 +1,5 @@
-// Get existing app settings and site config for merge
 var simpleAuthCurrentAppSettings = list('${provisionOutputs.simpleAuthOutput.value.webAppResourceId}/config/appsettings', '2021-02-01').properties
 
-// Merge TeamsFx configurations to Simple Auth resources
 module teamsFxSimpleAuthConfig '\{{fx-resource-simple-auth.Configuration.simpleAuth.path}}' = {
   name: 'addTeamsFxSimpleAuthConfiguration'
   params: {

package/templates/plugins/resource/simpleauth/bicep/simpleAuthConfiguration.template.bicep

@@ -47,14 +47,14 @@ var authorizedClientApplicationIds = '${teamsMobileOrDesktopAppClientId};${teams
 resource simpleAuthWebAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
   name: '${webAppName}/appsettings'
   properties: {
-    AAD_METADATA_ADDRESS: aadMetadataAddress // AAD metadata address used to validate access tokens
-    ALLOWED_APP_IDS: authorizedClientApplicationIds // Only allow access tokens from these clients
-    IDENTIFIER_URI: m365ApplicationIdUri // Application ID URI of AAD app
-    CLIENT_ID: m365ClientId // Client id of AAD app
-    CLIENT_SECRET: m365ClientSecret // Client secret of AAD app
-    OAUTH_AUTHORITY: oauthAuthority // AAD authority
+    AAD_METADATA_ADDRESS: aadMetadataAddress
+    ALLOWED_APP_IDS: authorizedClientApplicationIds
+    IDENTIFIER_URI: m365ApplicationIdUri
+    CLIENT_ID: m365ClientId
+    CLIENT_SECRET: m365ClientSecret
+    OAUTH_AUTHORITY: oauthAuthority
     {{#if (contains "fx-resource-frontend-hosting" plugins)}}
-    TAB_APP_ENDPOINT: tabAppEndpoint // Enable CORS for tab app
+    TAB_APP_ENDPOINT: tabAppEndpoint
     {{/if}}
   }
 }

package/templates/plugins/resource/simpleauth/bicep/simpleAuthProvision.template.bicep

@@ -2,12 +2,11 @@
 param provisionParameters object
 param userAssignedIdentityId string
 var resourceBaseName = provisionParameters.resourceBaseName
-var sku = contains(provisionParameters, 'simpleAuthSku') ? provisionParameters['simpleAuthSku'] : 'F1' // Try to read SKU for App Service Plan from parameters
-var serverFarmsName = contains(provisionParameters, 'simpleAuthServerFarmsName') ? provisionParameters['simpleAuthServerFarmsName'] : '${resourceBaseName}simpleAuth' // Try to read name for App Service Plan from parameters
-var webAppName = contains(provisionParameters, 'simpleAuthWebAppName') ? provisionParameters['simpleAuthWebAppName'] : '${resourceBaseName}simpleAuth' // Try to read name for Web App from parameters
-var simpleAuthPackageUri = contains(provisionParameters, 'simpleAuthPackageUri') ? provisionParameters['simpleAuthPackageUri'] : 'https://github.com/OfficeDev/TeamsFx/releases/download/simpleauth@0.1.0/Microsoft.TeamsFx.SimpleAuth_0.1.0.zip' // Try to read url of Simple Auth bits from parameters
+var sku = contains(provisionParameters, 'simpleAuthSku') ? provisionParameters['simpleAuthSku'] : 'F1'
+var serverFarmsName = contains(provisionParameters, 'simpleAuthServerFarmsName') ? provisionParameters['simpleAuthServerFarmsName'] : '${resourceBaseName}simpleAuth'
+var webAppName = contains(provisionParameters, 'simpleAuthWebAppName') ? provisionParameters['simpleAuthWebAppName'] : '${resourceBaseName}simpleAuth'
+var simpleAuthPackageUri = contains(provisionParameters, 'simpleAuthPackageUri') ? provisionParameters['simpleAuthPackageUri'] : 'https://github.com/OfficeDev/TeamsFx/releases/download/simpleauth@0.1.0/Microsoft.TeamsFx.SimpleAuth_0.1.0.zip'
 
-// Compute resources for Web App
 resource serverFarms 'Microsoft.Web/serverfarms@2021-02-01' = {
   name: serverFarmsName
   location: resourceGroup().location
@@ -17,24 +16,22 @@ resource serverFarms 'Microsoft.Web/serverfarms@2021-02-01' = {
   kind: 'app'
 }
 
-// Web App that hosts Simple Auth
 resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   kind: 'app'
   name: webAppName
   location: resourceGroup().location
   properties: {
     serverFarmId: serverFarms.id
-    keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    keyVaultReferenceIdentity: userAssignedIdentityId
   }
   identity: {
     type: 'UserAssigned'
     userAssignedIdentities: {
-      '${userAssignedIdentityId}': {} // The identity is used to access other Azure resources
+      '${userAssignedIdentityId}': {}
     }
   }
 }
 
-// Deploy Simple Auth bits to Web App
 resource simpleAuthDeploy 'Microsoft.Web/sites/extensions@2021-02-01' = {
   parent: webApp
   name: 'MSDeploy'

package/templates/plugins/resource/sql/bicep/sqlProvision.template.bicep

@@ -1,13 +1,12 @@
 @secure()
 param provisionParameters object
 var resourceBaseName = provisionParameters.resourceBaseName
-var sqlServerName = contains(provisionParameters, 'sqlServerName') ? provisionParameters['sqlServerName'] : '${resourceBaseName}' // Try to read name for SQL Server from parameters
-var sqlDatabaseName = contains(provisionParameters, 'sqlDatabaseName') ? provisionParameters['sqlDatabaseName'] : '${resourceBaseName}' // Try to read name for SQL Database from parameters
-var sqlDatabaseSku = contains(provisionParameters, 'sqlDatabaseSku') ? provisionParameters['sqlDatabaseSku'] : 'Basic' // Try to read SKU for SQL Database from parameters
-var administratorLogin = contains(provisionParameters, 'azureSqlAdmin') ? provisionParameters['azureSqlAdmin'] : '' // Try to read admin name for SQL Server from parameters, the value must be empty or same with the admin name used to create SQL Server
-var administratorLoginPassword = contains(provisionParameters, 'azureSqlAdminPassword') ? provisionParameters['azureSqlAdminPassword'] : '' // Try to read admin password for SQL Server from parameters, empty means do not update admin password
+var sqlServerName = contains(provisionParameters, 'sqlServerName') ? provisionParameters['sqlServerName'] : '${resourceBaseName}'
+var sqlDatabaseName = contains(provisionParameters, 'sqlDatabaseName') ? provisionParameters['sqlDatabaseName'] : '${resourceBaseName}'
+var sqlDatabaseSku = contains(provisionParameters, 'sqlDatabaseSku') ? provisionParameters['sqlDatabaseSku'] : 'Basic'
+var administratorLogin = contains(provisionParameters, 'azureSqlAdmin') ? provisionParameters['azureSqlAdmin'] : ''
+var administratorLoginPassword = contains(provisionParameters, 'azureSqlAdminPassword') ? provisionParameters['azureSqlAdminPassword'] : ''
 
-// SQL Server that hosts the databases
 resource sqlServer 'Microsoft.Sql/servers@2021-05-01-preview' = {
   location: resourceGroup().location
   name: sqlServerName
@@ -17,7 +16,6 @@ resource sqlServer 'Microsoft.Sql/servers@2021-05-01-preview' = {
   }
 }
 
-// SQL Database
 resource sqlDatabase 'Microsoft.Sql/servers/databases@2021-05-01-preview' = {
   parent: sqlServer
   location: resourceGroup().location
@@ -27,7 +25,6 @@ resource sqlDatabase 'Microsoft.Sql/servers/databases@2021-05-01-preview' = {
   }
 }
 
-// Allow Azure services connect to the SQL Server
 resource sqlFirewallRules 'Microsoft.Sql/servers/firewallRules@2021-05-01-preview' = {
   parent: sqlServer
   name: 'AllowAzure'

package/build/common/deps-checker/util/extensionInstaller.d.ts

@@ -1,3 +0,0 @@
-import { DepsLogger } from "../depsLogger";
-export declare function installExtension(backendRoot: string, dotnetCommand: string, logger: DepsLogger, csprojPath?: string, outputPath?: string): Promise<void>;
-//# sourceMappingURL=extensionInstaller.d.ts.map

package/build/common/deps-checker/util/extensionInstaller.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"extensionInstaller.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/extensionInstaller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,UAAU,EAClB,UAAU,GAAE,MAA0B,EACtC,UAAU,GAAE,MAA0B,GACrC,OAAO,CAAC,IAAI,CAAC,CA+Cf"}

package/build/common/deps-checker/util/extensionInstaller.js

@@ -1,47 +0,0 @@
-"use strict";
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.installExtension = void 0;
-const depsError_1 = require("../depsError");
-const constant_1 = require("../constant");
-const cpUtils_1 = require("./cpUtils");
-const defaultOutputPath = "bin";
-const defaultCsprojPath = "extensions.csproj";
-async function installExtension(backendRoot, dotnetCommand, logger, csprojPath = defaultCsprojPath, outputPath = defaultOutputPath) {
-    try {
-        if (!outputPath) {
-            outputPath = defaultOutputPath;
-        }
-        await checkCommand(dotnetCommand, logger);
-        const result = await cpUtils_1.cpUtils.tryExecuteCommand(backendRoot, logger, { shell: false }, dotnetCommand, "build", csprojPath, "-o", outputPath, "--ignore-failed-sources");
-        if (result.code !== 0) {
-            throw new Error(`Failed to run "${dotnetCommand} build" command. output = ${result.cmdOutput}, err = ${result.cmdOutputIncludingStderr}`);
-        }
-    }
-    catch (error) {
-        await logger.printDetailLog();
-        await logger.error(`Failed to run backend extension install: error = '${error}'`);
-        if (error.message.includes("NETSDK1045")) {
-            // refer to https://docs.microsoft.com/en-us/dotnet/core/tools/sdk-errors/netsdk1045
-            throw new depsError_1.BackendExtensionsInstallError(`NETSDK1045: The current .NET SDK does not support 'newer version' as a target`, constant_1.dotnetNotSupportTargetVersionHelpLink);
-        }
-        if (error instanceof depsError_1.BackendExtensionsInstallError) {
-            throw error;
-        }
-        else {
-            throw new depsError_1.BackendExtensionsInstallError(`Failed to run backend extension install: error = '${error}'`, constant_1.defaultHelpLink);
-        }
-    }
-    finally {
-        logger.cleanup();
-    }
-}
-exports.installExtension = installExtension;
-async function checkCommand(command, logger) {
-    if (command === "") {
-        await logger.error(`Failed to run backend extension install, .NET SDK executable not found`);
-        throw new depsError_1.BackendExtensionsInstallError("Failed to run backend extension install, .NET SDK executable not found", constant_1.defaultHelpLink);
-    }
-}
-//# sourceMappingURL=extensionInstaller.js.map

package/build/common/deps-checker/util/extensionInstaller.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extensionInstaller.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/extensionInstaller.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,4CAA6D;AAC7D,0CAAqF;AACrF,uCAAoC;AAEpC,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAChC,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAEvC,KAAK,UAAU,gBAAgB,CACpC,WAAmB,EACnB,aAAqB,EACrB,MAAkB,EAClB,aAAqB,iBAAiB,EACtC,aAAqB,iBAAiB;IAEtC,IAAI;QACF,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,iBAAiB,CAAC;SAChC;QACD,MAAM,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QAE1C,MAAM,MAAM,GAA2B,MAAM,iBAAO,CAAC,iBAAiB,CACpE,WAAW,EACX,MAAM,EACN,EAAE,KAAK,EAAE,KAAK,EAAE,EAChB,aAAa,EACb,OAAO,EACP,UAAU,EACV,IAAI,EACJ,UAAU,EACV,yBAAyB,CAC1B,CAAC;QAEF,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE;YACrB,MAAM,IAAI,KAAK,CACb,kBAAkB,aAAa,6BAA6B,MAAM,CAAC,SAAS,WAAW,MAAM,CAAC,wBAAwB,EAAE,CACzH,CAAC;SACH;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,MAAM,CAAC,cAAc,EAAE,CAAC;QAC9B,MAAM,MAAM,CAAC,KAAK,CAAC,qDAAqD,KAAK,GAAG,CAAC,CAAC;QAElF,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACxC,oFAAoF;YACpF,MAAM,IAAI,yCAA6B,CACrC,+EAA+E,EAC/E,gDAAqC,CACtC,CAAC;SACH;QAED,IAAI,KAAK,YAAY,yCAA6B,EAAE;YAClD,MAAM,KAAK,CAAC;SACb;aAAM;YACL,MAAM,IAAI,yCAA6B,CACrC,qDAAqD,KAAK,GAAG,EAC7D,0BAAe,CAChB,CAAC;SACH;KACF;YAAS;QACR,MAAM,CAAC,OAAO,EAAE,CAAC;KAClB;AACH,CAAC;AArDD,4CAqDC;AAED,KAAK,UAAU,YAAY,CAAC,OAAe,EAAE,MAAkB;IAC7D,IAAI,OAAO,KAAK,EAAE,EAAE;QAClB,MAAM,MAAM,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;QAC7F,MAAM,IAAI,yCAA6B,CACrC,wEAAwE,EACxE,0BAAe,CAChB,CAAC;KACH;AACH,CAAC"}

package/build/common/deps-checker/util/index.d.ts

@@ -1,5 +0,0 @@
-export * from "./cpUtils";
-export * from "./system";
-export * from "./progressIndicator";
-export * from "./extensionInstaller";
-//# sourceMappingURL=index.d.ts.map

package/build/common/deps-checker/util/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC"}

package/build/common/deps-checker/util/index.js

@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./cpUtils"), exports);
-tslib_1.__exportStar(require("./system"), exports);
-tslib_1.__exportStar(require("./progressIndicator"), exports);
-tslib_1.__exportStar(require("./extensionInstaller"), exports);
-//# sourceMappingURL=index.js.map

package/build/common/deps-checker/util/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,oDAA0B;AAC1B,mDAAyB;AACzB,8DAAoC;AACpC,+DAAqC"}

package/build/common/local/depsAdapter.d.ts

@@ -1,27 +0,0 @@
-import { LogProvider, TelemetryReporter } from "@microsoft/teamsfx-api";
-import { DepsCheckerEvent } from "../deps-checker/constant/telemetry";
-import { DepsLogger } from "../deps-checker/depsLogger";
-import { DepsTelemetry } from "../deps-checker/depsTelemetry";
-export declare class DepsTelemetryAdapter implements DepsTelemetry {
-    private telemetryReporter;
-    constructor(telemetryReporter: TelemetryReporter | undefined);
-    sendEvent(eventName: DepsCheckerEvent, properties?: {
-        [p: string]: string;
-    }, timecost?: number): void;
-    sendEventWithDuration(eventName: DepsCheckerEvent, action: () => Promise<void>): Promise<void>;
-    sendUserErrorEvent(eventName: DepsCheckerEvent, errorMessage: string): void;
-    sendSystemErrorEvent(eventName: DepsCheckerEvent, errorMessage: string, errorStack: string): void;
-}
-export declare class DepsLoggerAdapter implements DepsLogger {
-    private logger;
-    constructor(logger: LogProvider | undefined);
-    debug(message: string): Promise<boolean>;
-    info(message: string): Promise<boolean>;
-    warning(message: string): Promise<boolean>;
-    error(message: string): Promise<boolean>;
-    append(message: string): Promise<boolean>;
-    appendLine(message: string): Promise<boolean>;
-    printDetailLog(): Promise<void>;
-    cleanup(): void;
-}
-//# sourceMappingURL=depsAdapter.d.ts.map

package/build/common/local/depsAdapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"depsAdapter.d.ts","sourceRoot":"","sources":["../../../src/common/local/depsAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAG9D,qBAAa,oBAAqB,YAAW,aAAa;IACxD,OAAO,CAAC,iBAAiB,CAAgC;gBAEtC,iBAAiB,EAAE,iBAAiB,GAAG,SAAS;IAG5D,SAAS,CACd,SAAS,EAAE,gBAAgB,EAC3B,UAAU,CAAC,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACpC,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI;IAKM,qBAAqB,CAChC,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC;IAMT,kBAAkB,CAAC,SAAS,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAM3E,oBAAoB,CACzB,SAAS,EAAE,gBAAgB,EAC3B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,IAAI;CAKR;AAGD,qBAAa,iBAAkB,YAAW,UAAU;IAClD,OAAO,CAAC,MAAM,CAA0B;gBAErB,MAAM,EAAE,WAAW,GAAG,SAAS;IAGrC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMxC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMvC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM1C,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMxC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMzC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM7C,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5C,OAAO,IAAI,IAAI;CAKhB"}