From 060343f096eda85a824dd9646502b62337973f2d Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Wed, 6 Mar 2019 21:53:09 -0800 Subject: [PATCH] fix couple build issue due to merge issue (#4324) * fix the build error on linux and mac * one more fix --- .../src/wizards/create-cluster/createClusterModel.ts | 4 ++-- extensions/dacpac/src/wizard/api/basePage.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/big-data-cluster/src/wizards/create-cluster/createClusterModel.ts b/extensions/big-data-cluster/src/wizards/create-cluster/createClusterModel.ts index ea23e01155..bdbf7220d6 100644 --- a/extensions/big-data-cluster/src/wizards/create-cluster/createClusterModel.ts +++ b/extensions/big-data-cluster/src/wizards/create-cluster/createClusterModel.ts @@ -58,8 +58,8 @@ export class CreateClusterModel implements Scriptable { type: TargetClusterType.NewAksCluster, name: localize('bdc-create.AKSClusterCardText', 'New AKS Cluster'), fullName: localize('bdc-create.AKSClusterFullName', 'New Azure Kubernetes Service cluster'), - description: localize('bdc-create.AKSClusterDescription', 'This option configures new Azure Kubernetes Service (AKS) for SQL Server big data cluster deployments. ' - + 'AKS makes it simple to create, configure and manage a cluster of virutal machines that are preconfigured with a Kubernetes cluster to run containerized applications.'), + description: localize('bdc-create.AKSClusterDescription', + 'This option configures new Azure Kubernetes Service (AKS) for SQL Server big data cluster deployments. AKS makes it simple to create, configure and manage a cluster of virutal machines that are preconfigured with a Kubernetes cluster to run containerized applications.'), iconPath: { dark: 'images/cluster_inverse.svg', light: 'images/cluster.svg' diff --git a/extensions/dacpac/src/wizard/api/basePage.ts b/extensions/dacpac/src/wizard/api/basePage.ts index c462745733..a9203875d5 100644 --- a/extensions/dacpac/src/wizard/api/basePage.ts +++ b/extensions/dacpac/src/wizard/api/basePage.ts @@ -9,7 +9,7 @@ import { DacFxDataModel } from './models'; export abstract class BasePage { - protected readonly wizardPage: azdata.window.modelviewdialog.WizardPage; + protected readonly wizardPage: azdata.window.WizardPage; protected readonly model: DacFxDataModel; protected readonly view: azdata.ModelView;