@microsoft/teamsfx-core 2.0.4-rc.1 → 2.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/deps-checker/checkerFactory.d.ts +2 -1
- package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
- package/build/common/deps-checker/checkerFactory.js +2 -2
- package/build/common/deps-checker/checkerFactory.js.map +1 -1
- package/build/common/deps-checker/depsLogger.d.ts +14 -14
- package/build/common/deps-checker/depsLogger.d.ts.map +1 -1
- package/build/common/deps-checker/depsLogger.js +21 -7
- package/build/common/deps-checker/depsLogger.js.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/dotnetChecker.js +35 -40
- package/build/common/deps-checker/internal/dotnetChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +3 -3
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/deps-checker/util/cpUtils.d.ts +1 -1
- package/build/common/deps-checker/util/cpUtils.d.ts.map +1 -1
- package/build/common/deps-checker/util/cpUtils.js +4 -4
- package/build/common/deps-checker/util/cpUtils.js.map +1 -1
- package/build/common/deps-checker/util/progressIndicator.js +2 -2
- package/build/common/deps-checker/util/progressIndicator.js.map +1 -1
- package/build/common/local/localCertificateManager.d.ts.map +1 -1
- package/build/common/local/localCertificateManager.js +0 -3
- package/build/common/local/localCertificateManager.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +0 -1
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/local/portChecker.js.map +1 -1
- package/build/common/m365/launchHelper.d.ts.map +1 -1
- package/build/common/m365/launchHelper.js +0 -9
- package/build/common/m365/launchHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +0 -38
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectSettingsHelper.d.ts.map +1 -1
- package/build/common/projectSettingsHelper.js +0 -1
- package/build/common/projectSettingsHelper.js.map +1 -1
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.d.ts.map +1 -1
- package/build/common/spec-parser/adaptiveCardGenerator.js +32 -38
- package/build/common/spec-parser/adaptiveCardGenerator.js.map +1 -1
- package/build/common/spec-parser/constants.d.ts +10 -10
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +10 -11
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +0 -6
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +0 -6
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +18 -25
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specFilter.d.ts.map +1 -1
- package/build/common/spec-parser/specFilter.js +33 -26
- package/build/common/spec-parser/specFilter.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts +0 -5
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +109 -147
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +0 -1
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +1 -13
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/common/telemetry.d.ts +4 -7
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +8 -42
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/component/configManager/interface.d.ts +1 -0
- package/build/component/configManager/interface.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.d.ts +3 -1
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +49 -20
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/configManager/parser.js.map +1 -1
- package/build/component/constants.d.ts +0 -5
- package/build/component/constants.d.ts.map +1 -1
- package/build/component/constants.js +1 -6
- package/build/component/constants.js.map +1 -1
- package/build/component/coordinator/index.d.ts +6 -7
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +51 -41
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/coordinator/summary.d.ts.map +1 -1
- package/build/component/coordinator/summary.js +1 -2
- package/build/component/coordinator/summary.js.map +1 -1
- package/build/component/developerPortalScaffoldUtils.js +3 -3
- package/build/component/developerPortalScaffoldUtils.js.map +1 -1
- package/build/component/driver/aad/create.d.ts +0 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +5 -2
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/update.d.ts +0 -1
- package/build/component/driver/aad/update.d.ts.map +1 -1
- package/build/component/driver/aad/update.js +5 -2
- package/build/component/driver/aad/update.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +4 -37
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/arm/deploy.d.ts +3 -1
- package/build/component/driver/arm/deploy.d.ts.map +1 -1
- package/build/component/driver/arm/deploy.js +14 -1
- package/build/component/driver/arm/deploy.js.map +1 -1
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +0 -8
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/arm/util/bicepChecker.js +6 -7
- package/build/component/driver/arm/util/bicepChecker.js.map +1 -1
- package/build/component/driver/arm/util/handleError.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts +0 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +5 -2
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts +0 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +9 -3
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js +5 -12
- package/build/component/driver/deploy/azure/azureStorageDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js +3 -10
- package/build/component/driver/deploy/azure/azureStorageStaticWebsiteConfigDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +14 -22
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +8 -8
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js +4 -4
- package/build/component/driver/deploy/azure/impl/baseDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts +0 -1
- package/build/component/driver/deploy/spfx/deployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/spfx/deployDriver.js +2 -8
- package/build/component/driver/deploy/spfx/deployDriver.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts +0 -1
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +8 -12
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts +0 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js +9 -3
- package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts +0 -1
- package/build/component/driver/file/createOrUpdateJsonFile.d.ts.map +1 -1
- package/build/component/driver/file/createOrUpdateJsonFile.js +9 -3
- package/build/component/driver/file/createOrUpdateJsonFile.js.map +1 -1
- package/build/component/driver/interface/stepDriver.d.ts +7 -2
- package/build/component/driver/interface/stepDriver.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.d.ts +0 -1
- package/build/component/driver/m365/acquire.d.ts.map +1 -1
- package/build/component/driver/m365/acquire.js +9 -3
- package/build/component/driver/m365/acquire.js.map +1 -1
- package/build/component/driver/middleware/updateProgress.d.ts +6 -0
- package/build/component/driver/middleware/updateProgress.d.ts.map +1 -0
- package/build/component/driver/middleware/updateProgress.js +15 -0
- package/build/component/driver/middleware/updateProgress.js.map +1 -0
- package/build/component/driver/script/baseBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/baseBuildDriver.js +0 -1
- package/build/component/driver/script/baseBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +1 -10
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +30 -31
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/appStudio.d.ts.map +1 -1
- package/build/component/driver/teamsApp/appStudio.js +2 -2
- package/build/component/driver/teamsApp/appStudio.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +5 -21
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/authSvcClient.js +0 -2
- package/build/component/driver/teamsApp/clients/authSvcClient.js.map +1 -1
- package/build/component/driver/teamsApp/configure.d.ts +0 -1
- package/build/component/driver/teamsApp/configure.d.ts.map +1 -1
- package/build/component/driver/teamsApp/configure.js +6 -3
- package/build/component/driver/teamsApp/configure.js.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts +0 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.d.ts.map +1 -1
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js +5 -2
- package/build/component/driver/teamsApp/copyAppPackageToSPFx.js.map +1 -1
- package/build/component/driver/teamsApp/create.d.ts +0 -1
- package/build/component/driver/teamsApp/create.d.ts.map +1 -1
- package/build/component/driver/teamsApp/create.js +6 -5
- package/build/component/driver/teamsApp/create.js.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.d.ts +2 -3
- package/build/component/driver/teamsApp/createAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/createAppPackage.js +24 -22
- package/build/component/driver/teamsApp/createAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +0 -2
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts +0 -3
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtension.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts +0 -1
- package/build/component/driver/teamsApp/interfaces/appdefinitions/messagingExtensionCommand.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts +0 -1
- package/build/component/driver/teamsApp/publishAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/publishAppPackage.js +6 -3
- package/build/component/driver/teamsApp/publishAppPackage.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +0 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts +2 -2
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +10 -21
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validate.d.ts +0 -1
- package/build/component/driver/teamsApp/validate.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validate.js +6 -3
- package/build/component/driver/teamsApp/validate.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts +0 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +6 -3
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/feature/collaboration.d.ts.map +1 -1
- package/build/component/feature/collaboration.js +6 -25
- package/build/component/feature/collaboration.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +4 -10
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +1 -3
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +25 -59
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +13 -16
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/officeAddin/generator.js +3 -3
- package/build/component/generator/officeAddin/generator.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.d.ts.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +2 -6
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +2 -4
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +3 -3
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +2 -2
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +3 -3
- package/build/component/generator/spfx/utils/utils.js.map +1 -1
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +1 -2
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/messages.d.ts +3 -2
- package/build/component/messages.d.ts.map +1 -1
- package/build/component/messages.js +4 -3
- package/build/component/messages.js.map +1 -1
- package/build/component/provisionUtils.d.ts +3 -3
- package/build/component/provisionUtils.d.ts.map +1 -1
- package/build/component/provisionUtils.js +3 -3
- package/build/component/provisionUtils.js.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/appStudioClient.js +2 -24
- package/build/component/resource/botService/appStudio/appStudioClient.js.map +1 -1
- package/build/component/telemetry.js +2 -2
- package/build/component/telemetry.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts +2 -2
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +4 -1
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/charsetUtils.js +3 -3
- package/build/component/utils/charsetUtils.js.map +1 -1
- package/build/component/utils/common.js +1 -1
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.d.ts.map +1 -1
- package/build/component/utils/depsChecker/cpUtils.js +4 -8
- package/build/component/utils/depsChecker/cpUtils.js.map +1 -1
- package/build/component/utils/envUtil.js +2 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/teamsFxTelemetryReporter.js +2 -2
- package/build/component/utils/teamsFxTelemetryReporter.js.map +1 -1
- package/build/core/FxCore.d.ts +34 -38
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +64 -818
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCoreImplementV3.d.ts +49 -0
- package/build/core/FxCoreImplementV3.d.ts.map +1 -0
- package/build/core/FxCoreImplementV3.js +717 -0
- package/build/core/FxCoreImplementV3.js.map +1 -0
- package/build/core/globalVars.d.ts +0 -16
- package/build/core/globalVars.d.ts.map +1 -1
- package/build/core/globalVars.js +1 -34
- package/build/core/globalVars.js.map +1 -1
- package/build/core/middleware/concurrentLocker.d.ts.map +1 -1
- package/build/core/middleware/concurrentLocker.js +3 -7
- package/build/core/middleware/concurrentLocker.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +5 -5
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +1 -2
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +0 -3
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/build/error/common.d.ts +8 -2
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +33 -8
- package/build/error/common.js.map +1 -1
- package/build/index.d.ts +0 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +0 -1
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +2 -2
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +2 -2
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +1 -5
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +69 -99
- package/build/question/create.js.map +1 -1
- package/build/question/generator.d.ts +1 -2
- package/build/question/generator.d.ts.map +1 -1
- package/build/question/generator.js +50 -151
- package/build/question/generator.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +3 -7
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/inputs/CreateSampleProjectInputs.d.ts +1 -1
- package/build/question/inputs/CreateSampleProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +7 -24
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.js +1 -12
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +10 -18
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +1 -4
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +2 -6
- package/build/question/questionNames.js.map +1 -1
- package/build/ui/validationUtils.d.ts +3 -6
- package/build/ui/validationUtils.d.ts.map +1 -1
- package/build/ui/validationUtils.js +14 -25
- package/build/ui/validationUtils.js.map +1 -1
- package/build/ui/visitor.d.ts +0 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +156 -69
- package/build/ui/visitor.js.map +1 -1
- package/package.json +8 -5
- package/resource/package.nls.json +12 -20
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Tab/GetUserProfile.razor +2 -1
- package/templates/plugins/resource/aad/auth/tab/csharp/GetUserProfile.razor +2 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { DepsChecker, DepsType } from "./depsChecker";
|
|
2
1
|
import { DepsLogger } from "./depsLogger";
|
|
3
2
|
import { DepsTelemetry } from "./depsTelemetry";
|
|
3
|
+
import { DepsChecker } from "./depsChecker";
|
|
4
|
+
import { DepsType } from "./depsChecker";
|
|
4
5
|
export declare class CheckerFactory {
|
|
5
6
|
static createChecker(type: DepsType, logger: DepsLogger, telemetry: DepsTelemetry): DepsChecker;
|
|
6
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkerFactory.d.ts","sourceRoot":"","sources":["../../../src/common/deps-checker/checkerFactory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"checkerFactory.d.ts","sourceRoot":"","sources":["../../../src/common/deps-checker/checkerFactory.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,qBAAa,cAAc;WACX,aAAa,CACzB,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,aAAa,GACvB,WAAW;CAgBf"}
|
|
@@ -3,10 +3,10 @@
|
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.CheckerFactory = void 0;
|
|
6
|
-
const depsChecker_1 = require("./depsChecker");
|
|
7
6
|
const dotnetChecker_1 = require("./internal/dotnetChecker");
|
|
8
|
-
const funcToolChecker_1 = require("./internal/funcToolChecker");
|
|
9
7
|
const nodeChecker_1 = require("./internal/nodeChecker");
|
|
8
|
+
const funcToolChecker_1 = require("./internal/funcToolChecker");
|
|
9
|
+
const depsChecker_1 = require("./depsChecker");
|
|
10
10
|
const vxTestAppChecker_1 = require("./internal/vxTestAppChecker");
|
|
11
11
|
class CheckerFactory {
|
|
12
12
|
static createChecker(type, logger, telemetry) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkerFactory.js","sourceRoot":"","sources":["../../../src/common/deps-checker/checkerFactory.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC
|
|
1
|
+
{"version":3,"file":"checkerFactory.js","sourceRoot":"","sources":["../../../src/common/deps-checker/checkerFactory.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,4DAAyD;AAIzD,wDAA4E;AAC5E,gEAA6D;AAC7D,+CAAyC;AACzC,kEAA+D;AAE/D,MAAa,cAAc;IAClB,MAAM,CAAC,aAAa,CACzB,IAAc,EACd,MAAkB,EAClB,SAAwB;QAExB,QAAQ,IAAI,EAAE;YACZ,KAAK,sBAAQ,CAAC,WAAW;gBACvB,OAAO,IAAI,gCAAkB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YACnD,KAAK,sBAAQ,CAAC,OAAO;gBACnB,OAAO,IAAI,4BAAc,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAC/C,KAAK,sBAAQ,CAAC,MAAM;gBAClB,OAAO,IAAI,6BAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAC9C,KAAK,sBAAQ,CAAC,aAAa;gBACzB,OAAO,IAAI,iCAAe,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAChD,KAAK,sBAAQ,CAAC,SAAS;gBACrB,OAAO,IAAI,mCAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YACjD;gBACE,MAAM,KAAK,CAAC,8BAA8B,CAAC,CAAC;SAC/C;IACH,CAAC;CACF;AArBD,wCAqBC"}
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
export interface DepsLogger {
|
|
2
|
-
debug(message: string):
|
|
3
|
-
info(message: string):
|
|
4
|
-
warning(message: string):
|
|
5
|
-
error(message: string):
|
|
6
|
-
append(message: string):
|
|
7
|
-
appendLine(message: string):
|
|
8
|
-
printDetailLog(): void
|
|
2
|
+
debug(message: string): Promise<boolean>;
|
|
3
|
+
info(message: string): Promise<boolean>;
|
|
4
|
+
warning(message: string): Promise<boolean>;
|
|
5
|
+
error(message: string): Promise<boolean>;
|
|
6
|
+
append(message: string): Promise<boolean>;
|
|
7
|
+
appendLine(message: string): Promise<boolean>;
|
|
8
|
+
printDetailLog(): Promise<void>;
|
|
9
9
|
cleanup(): void;
|
|
10
10
|
}
|
|
11
11
|
export declare class EmptyLogger implements DepsLogger {
|
|
12
|
-
append(message: string):
|
|
13
|
-
appendLine(message: string):
|
|
12
|
+
append(message: string): Promise<boolean>;
|
|
13
|
+
appendLine(message: string): Promise<boolean>;
|
|
14
14
|
cleanup(): void;
|
|
15
|
-
debug(message: string):
|
|
16
|
-
error(message: string):
|
|
17
|
-
info(message: string):
|
|
18
|
-
printDetailLog(): void
|
|
19
|
-
warning(message: string):
|
|
15
|
+
debug(message: string): Promise<boolean>;
|
|
16
|
+
error(message: string): Promise<boolean>;
|
|
17
|
+
info(message: string): Promise<boolean>;
|
|
18
|
+
printDetailLog(): Promise<void>;
|
|
19
|
+
warning(message: string): Promise<boolean>;
|
|
20
20
|
}
|
|
21
21
|
//# sourceMappingURL=depsLogger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"depsLogger.d.ts","sourceRoot":"","sources":["../../../src/common/deps-checker/depsLogger.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"depsLogger.d.ts","sourceRoot":"","sources":["../../../src/common/deps-checker/depsLogger.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEzC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAExC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3C,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEzC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE1C,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE9C,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhC,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,qBAAa,WAAY,YAAW,UAAU;IAC5C,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIzC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI7C,OAAO,IAAI,IAAI;IAEf,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIxC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIxC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvC,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAG3C"}
|
|
@@ -4,14 +4,28 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.EmptyLogger = void 0;
|
|
6
6
|
class EmptyLogger {
|
|
7
|
-
append(message) {
|
|
8
|
-
|
|
7
|
+
append(message) {
|
|
8
|
+
return Promise.resolve(false);
|
|
9
|
+
}
|
|
10
|
+
appendLine(message) {
|
|
11
|
+
return Promise.resolve(false);
|
|
12
|
+
}
|
|
9
13
|
cleanup() { }
|
|
10
|
-
debug(message) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
14
|
+
debug(message) {
|
|
15
|
+
return Promise.resolve(false);
|
|
16
|
+
}
|
|
17
|
+
error(message) {
|
|
18
|
+
return Promise.resolve(false);
|
|
19
|
+
}
|
|
20
|
+
info(message) {
|
|
21
|
+
return Promise.resolve(false);
|
|
22
|
+
}
|
|
23
|
+
printDetailLog() {
|
|
24
|
+
return Promise.resolve(undefined);
|
|
25
|
+
}
|
|
26
|
+
warning(message) {
|
|
27
|
+
return Promise.resolve(false);
|
|
28
|
+
}
|
|
15
29
|
}
|
|
16
30
|
exports.EmptyLogger = EmptyLogger;
|
|
17
31
|
//# sourceMappingURL=depsLogger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"depsLogger.js","sourceRoot":"","sources":["../../../src/common/deps-checker/depsLogger.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAoBlC,MAAa,WAAW;IACtB,MAAM,CAAC,OAAe,
|
|
1
|
+
{"version":3,"file":"depsLogger.js","sourceRoot":"","sources":["../../../src/common/deps-checker/depsLogger.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAoBlC,MAAa,WAAW;IACtB,MAAM,CAAC,OAAe;QACpB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,UAAU,CAAC,OAAe;QACxB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,KAAU,CAAC;IAElB,KAAK,CAAC,OAAe;QACnB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,OAAe;QACnB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,cAAc;QACZ,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,CAAC,OAAe;QACrB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF;AA9BD,kCA8BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnetChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/dotnetChecker.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,gBAAgB,EAA0B,MAAM,cAAc,CAAC;AAKxE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAY,MAAM,gBAAgB,CAAC;AAOzE,oBAAY,aAAa;IACvB,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,GAAG,QAAQ;CACZ;AAOD,qBAAa,aAAc,YAAW,WAAW;IAC/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAW;IAClC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAiB;IACvC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAc;IAEtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;gBAE/B,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,WAAW,CACtB,WAAW,EAAE,OAAO,EACpB,KAAK,CAAC,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAiBf,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA6BhD,OAAO,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAuBpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA2CxB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;WAKzB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAYlD,OAAO,CAAC,MAAM,CAAC,mBAAmB;YAIpB,2BAA2B;
|
|
1
|
+
{"version":3,"file":"dotnetChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/dotnetChecker.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,gBAAgB,EAA0B,MAAM,cAAc,CAAC;AAKxE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAY,MAAM,gBAAgB,CAAC;AAOzE,oBAAY,aAAa;IACvB,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,GAAG,QAAQ;CACZ;AAOD,qBAAa,aAAc,YAAW,WAAW;IAC/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAW;IAClC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAiB;IACvC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAc;IAEtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;gBAE/B,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,WAAW,CACtB,WAAW,EAAE,OAAO,EACpB,KAAK,CAAC,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAiBf,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA6BhD,OAAO,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAuBpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA2CxB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;WAKzB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAYlD,OAAO,CAAC,MAAM,CAAC,mBAAmB;YAIpB,2BAA2B;YAkB3B,aAAa;mBAyBN,qBAAqB;YAc5B,qBAAqB;mBAId,OAAO;YAMd,sBAAsB;YA8DtB,0BAA0B;YAoB1B,yBAAyB;IAYvC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAIhC,OAAO,CAAC,MAAM,CAAC,gBAAgB;YAOjB,mBAAmB;YAKnB,gBAAgB;IA6C9B,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAM/B,OAAO,CAAC,MAAM,CAAC,0CAA0C;IAIzD,OAAO,CAAC,0BAA0B;IAI3B,cAAc,IAAI,MAAM;IAI/B,OAAO,CAAC,0BAA0B;IAIlC,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAIpC,OAAO,CAAC,iBAAiB;YA+BX,QAAQ;YAUR,sBAAsB;YAgDtB,yBAAyB;IAoBvC,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAQlC"}
|
|
@@ -56,10 +56,10 @@ class DotnetChecker {
|
|
|
56
56
|
}
|
|
57
57
|
async getInstallationInfo() {
|
|
58
58
|
const configPath = DotnetChecker.getDotnetConfigPath();
|
|
59
|
-
this._logger.debug(`[start] read dotnet path from '${configPath}'`);
|
|
59
|
+
await this._logger.debug(`[start] read dotnet path from '${configPath}'`);
|
|
60
60
|
const dotnetPath = await this.getDotnetExecPathFromConfig();
|
|
61
|
-
this._logger.debug(`[end] read dotnet path from '${configPath}', dotnetPath = '${dotnetPath
|
|
62
|
-
this._logger.debug(`[start] check dotnet version`);
|
|
61
|
+
await this._logger.debug(`[end] read dotnet path from '${configPath}', dotnetPath = '${dotnetPath}'`);
|
|
62
|
+
await this._logger.debug(`[start] check dotnet version`);
|
|
63
63
|
if (dotnetPath !== null && (await this.isDotnetInstalledCorrectly())) {
|
|
64
64
|
// filter out global sdk
|
|
65
65
|
if (dotnetPath.includes(`.${teamsfx_api_1.ConfigFolderName}`)) {
|
|
@@ -67,10 +67,10 @@ class DotnetChecker {
|
|
|
67
67
|
}
|
|
68
68
|
return await this.getDepsInfo(true);
|
|
69
69
|
}
|
|
70
|
-
this._logger.debug(`[end] check dotnet version`);
|
|
70
|
+
await this._logger.debug(`[end] check dotnet version`);
|
|
71
71
|
if ((await this.tryAcquireGlobalDotnetSdk()) && (await this.validate())) {
|
|
72
72
|
this._telemetry.sendEvent(telemetry_1.DepsCheckerEvent.dotnetAlreadyInstalled);
|
|
73
|
-
this._logger.info(`${message_1.Messages.useGlobalDotnet()} '${
|
|
73
|
+
await this._logger.info(`${message_1.Messages.useGlobalDotnet()} '${await this.getDotnetExecPathFromConfig()}'`);
|
|
74
74
|
return await this.getDepsInfo(true);
|
|
75
75
|
}
|
|
76
76
|
return await this.getDepsInfo(false);
|
|
@@ -85,8 +85,8 @@ class DotnetChecker {
|
|
|
85
85
|
return installationInfo;
|
|
86
86
|
}
|
|
87
87
|
catch (error) {
|
|
88
|
-
this._logger.printDetailLog();
|
|
89
|
-
this._logger.error(`${error.message}, error = '${error
|
|
88
|
+
await this._logger.printDetailLog();
|
|
89
|
+
await this._logger.error(`${error.message}, error = '${error}'`);
|
|
90
90
|
if (error instanceof depsError_1.DepsCheckerError) {
|
|
91
91
|
return await this.getDepsInfo(false, error);
|
|
92
92
|
}
|
|
@@ -100,23 +100,23 @@ class DotnetChecker {
|
|
|
100
100
|
if (system_1.isLinux()) {
|
|
101
101
|
throw new depsError_1.LinuxNotSupportedError(message_1.Messages.linuxDepsNotFound().split("@SupportedPackages").join(installedNameWithVersion), helpLink_1.dotnetExplanationHelpLink);
|
|
102
102
|
}
|
|
103
|
-
this._logger.debug(`[start] cleanup bin/dotnet and config`);
|
|
103
|
+
await this._logger.debug(`[start] cleanup bin/dotnet and config`);
|
|
104
104
|
await DotnetChecker.cleanup();
|
|
105
|
-
this._logger.debug(`[end] cleanup bin/dotnet and config`);
|
|
105
|
+
await this._logger.debug(`[end] cleanup bin/dotnet and config`);
|
|
106
106
|
const installDir = DotnetChecker.getDefaultInstallPath();
|
|
107
|
-
this._logger.debug(`[start] install dotnet ${installVersion}`);
|
|
108
|
-
this._logger.debug(message_1.Messages.dotnetNotFound()
|
|
107
|
+
await this._logger.debug(`[start] install dotnet ${installVersion}`);
|
|
108
|
+
await this._logger.debug(message_1.Messages.dotnetNotFound()
|
|
109
109
|
.replace("@NameVersion", installedNameWithVersion)
|
|
110
110
|
.replace("@HelpLink", helpLink_1.dotnetExplanationHelpLink));
|
|
111
|
-
this._logger.info(message_1.Messages.downloadDotnet()
|
|
111
|
+
await this._logger.info(message_1.Messages.downloadDotnet()
|
|
112
112
|
.replace("@NameVersion", installedNameWithVersion)
|
|
113
113
|
.replace("@InstallDir", installDir));
|
|
114
114
|
// TODO add progress log
|
|
115
115
|
await progressIndicator_1.runWithProgressIndicator(async () => {
|
|
116
116
|
await this.handleInstall(installVersion, installDir);
|
|
117
117
|
}, this._logger);
|
|
118
|
-
this._logger.debug(`[end] install dotnet ${installVersion}`);
|
|
119
|
-
this._logger.debug(`[start] validate dotnet version`);
|
|
118
|
+
await this._logger.debug(`[end] install dotnet ${installVersion}`);
|
|
119
|
+
await this._logger.debug(`[start] validate dotnet version`);
|
|
120
120
|
if (!(await this.validate())) {
|
|
121
121
|
this._telemetry.sendEvent(telemetry_1.DepsCheckerEvent.dotnetInstallError);
|
|
122
122
|
throw new depsError_1.DepsCheckerError(localizeUtils_1.getLocalizedString("error.common.InstallSoftwareError", installedNameWithVersion), helpLink_1.dotnetFailToInstallHelpLink);
|
|
@@ -149,10 +149,10 @@ class DotnetChecker {
|
|
|
149
149
|
if (typeof config.dotnetExecutablePath === "string") {
|
|
150
150
|
return config.dotnetExecutablePath;
|
|
151
151
|
}
|
|
152
|
-
this._logger.debug(`invalid dotnet config file format, config: '${JSON.stringify(config)}' `);
|
|
152
|
+
await this._logger.debug(`invalid dotnet config file format, config: '${JSON.stringify(config)}' `);
|
|
153
153
|
}
|
|
154
154
|
catch (error) {
|
|
155
|
-
this._logger.debug(`get dotnet path failed, error: '${error
|
|
155
|
+
await this._logger.debug(`get dotnet path failed, error: '${error}'`);
|
|
156
156
|
}
|
|
157
157
|
return null;
|
|
158
158
|
}
|
|
@@ -164,14 +164,14 @@ class DotnetChecker {
|
|
|
164
164
|
}
|
|
165
165
|
// NOTE: we don't need to handle directory creation since dotnet-install script will handle it.
|
|
166
166
|
await this.runDotnetInstallScript(version, installDir);
|
|
167
|
-
this._logger.debug(`[start] write dotnet path to config`);
|
|
167
|
+
await this._logger.debug(`[start] write dotnet path to config`);
|
|
168
168
|
const dotnetExecPath = DotnetChecker.getDotnetExecPathFromDotnetInstallationDir(installDir);
|
|
169
169
|
await DotnetChecker.persistDotnetExecPath(dotnetExecPath);
|
|
170
|
-
this._logger.debug(`[end] write dotnet path to config`);
|
|
171
|
-
this._logger.info(message_1.Messages.finishInstallDotnet().replace("@NameVersion", installedNameWithVersion));
|
|
170
|
+
await this._logger.debug(`[end] write dotnet path to config`);
|
|
171
|
+
await this._logger.info(message_1.Messages.finishInstallDotnet().replace("@NameVersion", installedNameWithVersion));
|
|
172
172
|
}
|
|
173
173
|
catch (error) {
|
|
174
|
-
this._logger.error(`${localizeUtils_1.getLocalizedString("error.common.InstallSoftwareError", installedNameWithVersion)}, error = '${error
|
|
174
|
+
await this._logger.error(`${localizeUtils_1.getLocalizedString("error.common.InstallSoftwareError", installedNameWithVersion)}, error = '${error}'`);
|
|
175
175
|
}
|
|
176
176
|
}
|
|
177
177
|
static async persistDotnetExecPath(dotnetExecPath) {
|
|
@@ -205,12 +205,12 @@ class DotnetChecker {
|
|
|
205
205
|
try {
|
|
206
206
|
fs.chmodSync(this.getDotnetInstallScriptPath(), "755");
|
|
207
207
|
const { stdout, stderr } = await execFile(command[0], command.slice(1), options);
|
|
208
|
-
this._logger.debug(`Finished running dotnet-install script, command = '${command.join(" ")}', options = '${JSON.stringify(options)}', stdout = '${stdout}', stderr = '${stderr}'`);
|
|
208
|
+
await this._logger.debug(`Finished running dotnet-install script, command = '${command.join(" ")}', options = '${JSON.stringify(options)}', stdout = '${stdout}', stderr = '${stderr}'`);
|
|
209
209
|
const timecost = Number(((perf_hooks_1.performance.now() - start) / 1000).toFixed(2));
|
|
210
210
|
if (stderr && stderr.length > 0) {
|
|
211
211
|
const errorMessage = `${localizeUtils_1.getLocalizedString("error.common.InstallSoftwareError", installedNameWithVersion)} ${message_1.Messages.dotnetInstallStderr()} stdout = '${stdout}', stderr = '${stderr}', timecost = '${timecost}s'`;
|
|
212
212
|
this._telemetry.sendSystemErrorEvent(telemetry_1.DepsCheckerEvent.dotnetInstallScriptError, telemetry_1.TelemtryMessages.failedToExecDotnetScript, errorMessage);
|
|
213
|
-
this._logger.error(errorMessage);
|
|
213
|
+
await this._logger.error(errorMessage);
|
|
214
214
|
}
|
|
215
215
|
else {
|
|
216
216
|
this._telemetry.sendEvent(telemetry_1.DepsCheckerEvent.dotnetInstallScriptCompleted, {}, timecost);
|
|
@@ -219,14 +219,10 @@ class DotnetChecker {
|
|
|
219
219
|
catch (error) {
|
|
220
220
|
const timecost = Number(((perf_hooks_1.performance.now() - start) / 1000).toFixed(2));
|
|
221
221
|
const errorMessage = `${localizeUtils_1.getLocalizedString("error.common.InstallSoftwareError", installedNameWithVersion)} ${message_1.Messages.dotnetInstallErrorCode()}, ` +
|
|
222
|
-
`command = '${command.join(" ")}', options = '${JSON.stringify(options
|
|
223
|
-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
224
|
-
)}', error = '${error}', stdout = '${error.stdout}', stderr = '${
|
|
225
|
-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
226
|
-
error.stderr}', timecost = '${timecost}s'`;
|
|
222
|
+
`command = '${command.join(" ")}', options = '${JSON.stringify(options)}', error = '${error}', stdout = '${error.stdout}', stderr = '${error.stderr}', timecost = '${timecost}s'`;
|
|
227
223
|
this._telemetry.sendSystemErrorEvent(telemetry_1.DepsCheckerEvent.dotnetInstallScriptError, telemetry_1.TelemtryMessages.failedToExecDotnetScript, errorMessage);
|
|
228
224
|
// swallow the exception since later validate will find out the errors anyway
|
|
229
|
-
this._logger.error(errorMessage);
|
|
225
|
+
await this._logger.error(errorMessage);
|
|
230
226
|
}
|
|
231
227
|
}
|
|
232
228
|
async isDotnetInstalledCorrectly() {
|
|
@@ -239,21 +235,20 @@ class DotnetChecker {
|
|
|
239
235
|
return this.isDotnetVersionsInstalled(installedVersions);
|
|
240
236
|
}
|
|
241
237
|
catch (error) {
|
|
242
|
-
const errorMessage = `validate private install failed, error = '${error
|
|
238
|
+
const errorMessage = `validate private install failed, error = '${error}'`;
|
|
243
239
|
this._telemetry.sendSystemErrorEvent(telemetry_1.DepsCheckerEvent.dotnetValidationError, telemetry_1.TelemtryMessages.failedToValidateDotnet, errorMessage);
|
|
244
|
-
this._logger.debug(errorMessage);
|
|
240
|
+
await this._logger.debug(errorMessage);
|
|
245
241
|
return false;
|
|
246
242
|
}
|
|
247
243
|
}
|
|
248
|
-
isDotnetVersionsInstalled(installedVersions) {
|
|
244
|
+
async isDotnetVersionsInstalled(installedVersions) {
|
|
249
245
|
try {
|
|
250
246
|
const validVersions = DotnetChecker.arrayIntersection(installedVersions, supportedVersions);
|
|
251
|
-
|
|
252
|
-
return Promise.resolve(validVersions.length > 0);
|
|
247
|
+
return validVersions.length > 0;
|
|
253
248
|
}
|
|
254
249
|
catch (error) {
|
|
255
|
-
this._logger.error(`failed to check .NET, installedVersions = '${installedVersions
|
|
256
|
-
return
|
|
250
|
+
await this._logger.error(`failed to check .NET, installedVersions = '${installedVersions}', supportedVersions = '${supportedVersions}', error = '${error}'`);
|
|
251
|
+
return false;
|
|
257
252
|
}
|
|
258
253
|
}
|
|
259
254
|
static arrayIntersection(lhs, rhs) {
|
|
@@ -294,8 +289,8 @@ class DotnetChecker {
|
|
|
294
289
|
});
|
|
295
290
|
}
|
|
296
291
|
catch (error) {
|
|
297
|
-
const errorMessage = `Failed to search dotnet sdk by dotnetPath = '${dotnetExecPath}', error = '${error
|
|
298
|
-
this._logger.debug(errorMessage);
|
|
292
|
+
const errorMessage = `Failed to search dotnet sdk by dotnetPath = '${dotnetExecPath}', error = '${error}'`;
|
|
293
|
+
await this._logger.debug(errorMessage);
|
|
299
294
|
this._telemetry.sendSystemErrorEvent(telemetry_1.DepsCheckerEvent.dotnetSearchDotnetSdks, telemetry_1.TelemtryMessages.failedToSearchDotnetSdks, errorMessage);
|
|
300
295
|
}
|
|
301
296
|
return sdks;
|
|
@@ -371,7 +366,7 @@ class DotnetChecker {
|
|
|
371
366
|
}
|
|
372
367
|
catch (error) {
|
|
373
368
|
this._telemetry.sendSystemErrorEvent(telemetry_1.DepsCheckerEvent.dotnetValidationError, telemetry_1.TelemtryMessages.failedToValidateDotnet, error);
|
|
374
|
-
this._logger.debug(`Failed to run hello world, dotnetPath = ${dotnetPath}, error = ${error
|
|
369
|
+
await this._logger.debug(`Failed to run hello world, dotnetPath = ${dotnetPath}, error = ${error}`);
|
|
375
370
|
}
|
|
376
371
|
finally {
|
|
377
372
|
await fs.remove(samplePath);
|
|
@@ -392,7 +387,7 @@ class DotnetChecker {
|
|
|
392
387
|
return true;
|
|
393
388
|
}
|
|
394
389
|
catch (error) {
|
|
395
|
-
this._logger.debug(`Failed to acquire global dotnet sdk, error = '${error
|
|
390
|
+
await this._logger.debug(`Failed to acquire global dotnet sdk, error = '${error}'`);
|
|
396
391
|
return false;
|
|
397
392
|
}
|
|
398
393
|
}
|
|
@@ -403,7 +398,7 @@ class DotnetChecker {
|
|
|
403
398
|
if (!match) {
|
|
404
399
|
return null;
|
|
405
400
|
}
|
|
406
|
-
return ((
|
|
401
|
+
return ((_a = match.groups) === null || _a === void 0 ? void 0 : _a.major_version) + "." + ((_b = match.groups) === null || _b === void 0 ? void 0 : _b.minor_version);
|
|
407
402
|
}
|
|
408
403
|
}
|
|
409
404
|
exports.DotnetChecker = DotnetChecker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnetChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/dotnetChecker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dotnetChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/dotnetChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ class NodeChecker {
|
|
|
29
29
|
let supportedVersions = [];
|
|
30
30
|
try {
|
|
31
31
|
supportedVersions = await this.getSupportedVersions(installOptions === null || installOptions === void 0 ? void 0 : installOptions.projectPath);
|
|
32
|
-
this._logger.debug(`NodeChecker checking for supported versions: '${JSON.stringify(supportedVersions)}'`);
|
|
32
|
+
await this._logger.debug(`NodeChecker checking for supported versions: '${JSON.stringify(supportedVersions)}'`);
|
|
33
33
|
const currentVersion = await NodeChecker.getInstalledNodeVersion();
|
|
34
34
|
if (currentVersion === null) {
|
|
35
35
|
this._telemetry.sendUserErrorEvent(telemetry_1.DepsCheckerEvent.nodeNotFound, "Node.js can't be found.");
|
|
@@ -53,8 +53,8 @@ class NodeChecker {
|
|
|
53
53
|
async resolve(installOptions) {
|
|
54
54
|
const installationInfo = await this.getInstallationInfo(installOptions);
|
|
55
55
|
if (installationInfo.error) {
|
|
56
|
-
this._logger.printDetailLog();
|
|
57
|
-
this._logger.error(`${installationInfo.error.message}, error = '${installationInfo.error
|
|
56
|
+
await this._logger.printDetailLog();
|
|
57
|
+
await this._logger.error(`${installationInfo.error.message}, error = '${installationInfo.error}'`);
|
|
58
58
|
}
|
|
59
59
|
this._logger.cleanup();
|
|
60
60
|
return installationInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/nodeChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,4DAA4B;AAC5B,mDAK8B;AAC9B,iDAA+C;AAC/C,qDAAyD;AACzD,gDAA6F;AAC7F,4CAKsB;AAGtB,6CAA0C;AAE1C,MAAM,QAAQ,GAAG,SAAS,CAAC;AAE3B,MAAM,WAAW;IAIf,YAAY,OAAe,EAAE,YAAoB;QAC/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;CACF;AAED,MAAsB,WAAW;IAgB/B,YAAY,MAAkB,EAAE,SAAwB;QACtD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,cAAmC;QAClE,IAAI,iBAAiB,GAAa,EAAE,CAAC;QACrC,IAAI;YACF,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,CAAC,CAAC;YAEjF,IAAI,CAAC,OAAO,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"nodeChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/nodeChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import * as cp from "child_process";
|
|
3
3
|
export interface DebugLogger {
|
|
4
|
-
debug(message: string):
|
|
4
|
+
debug(message: string): Promise<boolean>;
|
|
5
5
|
}
|
|
6
6
|
export declare namespace cpUtils {
|
|
7
7
|
function executeCommand(workingDirectory: string | undefined, logger: DebugLogger | undefined, options: cp.SpawnOptions | undefined, command: string, ...args: string[]): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cpUtils.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/cpUtils.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAGpC,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"cpUtils.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/cpUtils.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,MAAM,eAAe,CAAC;AAGpC,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1C;AAED,yBAAiB,OAAO,CAAC;IACvB,SAAsB,cAAc,CAClC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,OAAO,EAAE,EAAE,CAAC,YAAY,GAAG,SAAS,EACpC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAkBjB;IAED,SAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,iBAAiB,EAAE,EAAE,CAAC,YAAY,GAAG,SAAS,EAC9C,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,cAAc,CAAC,CAwEzB;IAED,UAAiB,cAAc;QAC7B,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,MAAM,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB;IAID;;OAEG;IACH,SAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;IAED;;OAEG;IACH,SAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAO5F;CACF"}
|
|
@@ -14,11 +14,11 @@ var cpUtils;
|
|
|
14
14
|
if (result.code !== 0) {
|
|
15
15
|
const errorMessage = `Failed to run command: "${command} ${result.formattedArgs}", code: "${result.code}",
|
|
16
16
|
output: "${result.cmdOutput}", error: "${result.cmdOutputIncludingStderr}"`;
|
|
17
|
-
logger === null || logger === void 0 ? void 0 : logger.debug(errorMessage);
|
|
17
|
+
await (logger === null || logger === void 0 ? void 0 : logger.debug(errorMessage));
|
|
18
18
|
throw new Error(errorMessage);
|
|
19
19
|
}
|
|
20
20
|
else {
|
|
21
|
-
logger === null || logger === void 0 ? void 0 : logger.debug(`Finished running command: "${command} ${result.formattedArgs}".`);
|
|
21
|
+
await (logger === null || logger === void 0 ? void 0 : logger.debug(`Finished running command: "${command} ${result.formattedArgs}".`));
|
|
22
22
|
}
|
|
23
23
|
return result.cmdOutput;
|
|
24
24
|
}
|
|
@@ -42,7 +42,7 @@ var cpUtils;
|
|
|
42
42
|
timer = setTimeout(() => {
|
|
43
43
|
childProc.kill();
|
|
44
44
|
logger === null || logger === void 0 ? void 0 : logger.debug(`Stop exec due to timeout, command: "${command} ${formattedArgs}", options = '${JSON.stringify(options)}'`);
|
|
45
|
-
reject(new Error(`Exec command: "${command} ${formattedArgs}" timeout, ${options.timeout
|
|
45
|
+
reject(new Error(`Exec command: "${command} ${formattedArgs}" timeout, ${options.timeout} ms`));
|
|
46
46
|
}, options.timeout);
|
|
47
47
|
}
|
|
48
48
|
logger === null || logger === void 0 ? void 0 : logger.debug(`Running command: "${command} ${formattedArgs}", options = '${JSON.stringify(options)}'`);
|
|
@@ -56,7 +56,7 @@ var cpUtils;
|
|
|
56
56
|
cmdOutputIncludingStderr = cmdOutputIncludingStderr.concat(data);
|
|
57
57
|
});
|
|
58
58
|
childProc.on("error", (error) => {
|
|
59
|
-
logger === null || logger === void 0 ? void 0 : logger.debug(`Failed to run command '${command} ${formattedArgs}': cmdOutputIncludingStderr: '${cmdOutputIncludingStderr}', error: ${error
|
|
59
|
+
logger === null || logger === void 0 ? void 0 : logger.debug(`Failed to run command '${command} ${formattedArgs}': cmdOutputIncludingStderr: '${cmdOutputIncludingStderr}', error: ${error}`);
|
|
60
60
|
if (timer) {
|
|
61
61
|
clearTimeout(timer);
|
|
62
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cpUtils.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/cpUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,oDAAoD;AACpD,0DAAoC;AACpC,+CAAyB;AAMzB,IAAiB,OAAO,CAsIvB;AAtID,WAAiB,OAAO;IACf,KAAK,UAAU,cAAc,CAClC,gBAAoC,EACpC,MAA+B,EAC/B,OAAoC,EACpC,OAAe,EACf,GAAG,IAAc;QAEjB,MAAM,MAAM,GAAmB,MAAM,iBAAiB,CACpD,gBAAgB,EAChB,MAAM,EACN,OAAO,EACP,OAAO,EACP,GAAG,IAAI,CACR,CAAC;QACF,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE;YACrB,MAAM,YAAY,GAAG,2BAA2B,OAAO,IAAI,MAAM,CAAC,aAAa,aAAa,MAAM,CAAC,IAAI;uCACtE,MAAM,CAAC,SAAS,cAAc,MAAM,CAAC,wBAAwB,GAAG,CAAC;YAClG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cpUtils.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/cpUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.runWithProgressIndicator = void 0;
|
|
6
6
|
const downloadIndicatorInterval = 1000; // same as vscode-dotnet-runtime
|
|
7
7
|
async function runWithProgressIndicator(callback, logger) {
|
|
8
|
-
const timer = setInterval(() => logger.append("."), downloadIndicatorInterval);
|
|
8
|
+
const timer = setInterval(async () => await logger.append("."), downloadIndicatorInterval);
|
|
9
9
|
try {
|
|
10
10
|
await callback();
|
|
11
11
|
}
|
|
12
12
|
finally {
|
|
13
13
|
clearTimeout(timer);
|
|
14
|
-
logger.appendLine("");
|
|
14
|
+
await logger.appendLine("");
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
exports.runWithProgressIndicator = runWithProgressIndicator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progressIndicator.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/progressIndicator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,MAAM,yBAAyB,GAAG,IAAI,CAAC,CAAC,gCAAgC;AAEjE,KAAK,UAAU,wBAAwB,CAC5C,QAA6B,EAC7B,MAAkB;IAElB,MAAM,KAAK,GAAG,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"progressIndicator.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/util/progressIndicator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAIlC,MAAM,yBAAyB,GAAG,IAAI,CAAC,CAAC,gCAAgC;AAEjE,KAAK,UAAU,wBAAwB,CAC5C,QAA6B,EAC7B,MAAkB;IAElB,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,yBAAyB,CAAC,CAAC;IAC3F,IAAI;QACF,MAAM,QAAQ,EAAE,CAAC;KAClB;YAAS;QACR,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;KAC7B;AACH,CAAC;AAXD,4DAWC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localCertificateManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,WAAW,EACX,eAAe,EACf,OAAO,EAER,MAAM,wBAAwB,CAAC;AA0BhC,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAkB;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,EAAE,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW;IAStD;;;;;;;OAOG;IACU,gBAAgB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"localCertificateManager.d.ts","sourceRoot":"","sources":["../../../src/common/local/localCertificateManager.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,WAAW,EACX,eAAe,EACf,OAAO,EAER,MAAM,wBAAwB,CAAC;AA0BhC,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAkB;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,EAAE,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,WAAW;IAStD;;;;;;;OAOG;IACU,gBAAgB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAsD9D,mBAAmB;IA+DjC,OAAO,CAAC,wBAAwB;YAsFlB,wBAAwB;YA8BxB,gBAAgB;YAmDhB,kBAAkB;YAuBlB,uBAAuB;YAcvB,uBAAuB;CAqCtC"}
|
|
@@ -80,7 +80,6 @@ class LocalCertificateManager {
|
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
catch (error) {
|
|
83
|
-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
84
83
|
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.warning(`Failed to setup certificate. Error: ${error}`);
|
|
85
84
|
localCert.isTrusted = false;
|
|
86
85
|
localCert.error = new teamsfx_api_1.UserError({
|
|
@@ -238,7 +237,6 @@ class LocalCertificateManager {
|
|
|
238
237
|
}
|
|
239
238
|
catch (error) {
|
|
240
239
|
// treat any error as not verified, to not block the main progress
|
|
241
|
-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
242
240
|
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`Certificate unverified. Details: ${error}`);
|
|
243
241
|
return false;
|
|
244
242
|
}
|
|
@@ -274,7 +272,6 @@ class LocalCertificateManager {
|
|
|
274
272
|
}
|
|
275
273
|
catch (error) {
|
|
276
274
|
// treat any error as install failure, to not block the main progress
|
|
277
|
-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
278
275
|
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.warning(`Failed to install certificate. Error: ${error}`);
|
|
279
276
|
localCert.isTrusted = false;
|
|
280
277
|
localCert.error = new teamsfx_api_1.UserError({
|