Merge branch 'master' into microsoft/samirpuranik/telemetry-init

Author: samir-puranik

.gitignore

@@ -1,4 +1,5 @@
 pgsqltoolsservice
 node_modules
 out
+*nls.*.json
 *.vsix

.pipeline/localization-pipeline.yml

@@ -0,0 +1,41 @@
+trigger:
+  batch: true
+  branches:
+    include:
+    - master
+  paths:
+    include:
+    - src/l10n/l10n.xlf
+    - src/loc
+
+pr: none
+
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: refs/heads/main
+
+jobs:
+- job: localization
+  displayName: localization
+  pool:
+    vmImage: windows-latest
+  steps:
+  - checkout: self
+    clean: true
+    fetchTags: true
+  - task: OneLocBuild@2
+    displayName: Localization Build
+    inputs:
+      locProj: src/LocProject.json
+      outDir: $(Build.ArtifactStagingDirectory)
+      isCreatePrSelected: true
+      repoType: gitHub
+      gitHubPatVariable: $(githubPatToken)
+      prSourceBranchPrefix: locfiles
+      gitHubPrMergeMethod: squash
+      packageSourceAuth: patAuth
+      patVariable: $(OneLocBuildPat)
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: drop'

.pipeline/release-pipeline.yml

@@ -1,5 +1,4 @@
-trigger:
-  - release
+trigger: none
 pr: none
 jobs:
   - job: build_artifacts

.pipeline/snap-pipeline.yaml

@@ -1,13 +1,12 @@
 trigger: none
-pr:
-  - release
+pr: none
 jobs:
   - job: build_artifacts
     displayName: Build and Publish Artifacts
     pool:
       vmImage: 'windows-latest'
     steps:
-    - template: templates/build-snap.yml
+    - template: templates/build.yml
     - template: templates/code-sign.yml
     - task: CopyFiles@2
       condition: always()

.pipeline/templates/build-snap.yml

@@ -2,7 +2,7 @@ steps:
 - task: EsrpCodeSigning@3
   displayName: 'Code Signing'
   inputs:
-    ConnectedServiceName: 'Database System ESRP Connector'
+    ConnectedServiceName: 'OrcaSQL ESRP Code Sign'
     FolderPath: '$(Build.SourcesDirectory)'
     Pattern: '*.vsix'
     useMinimatch: true
@@ -28,5 +28,4 @@ steps:
       ]
     SessionTimeout: '60'
     MaxConcurrency: '50'
-    MaxRetryAttempts: '5'
-  condition: eq(variables['platform'], 'windows')
+    MaxRetryAttempts: '5'

.pipeline/templates/code-sign.yml

@@ -9,10 +9,72 @@ var srcmap = require('gulp-sourcemaps');
 var config = require('./tasks/config');
 var cproc = require('child_process');
 var nls = require('vscode-nls-dev');
-
+const path = require('path');
+const es = require('event-stream')
 require('./tasks/packagetasks')
 
-const languages = [ /* for example { folderName: 'ru', id: 'ru' } */ ];
+const languages = [
+    { id: 'zh-tw', folderName: 'cht', localeId: 'zh-Hant'},
+    { id: 'zh-cn', folderName: 'chs', localeId: 'zh-Hans'},
+    { id: 'ja', folderName: 'jpn' },
+    { id: 'ko', folderName: 'kor' },
+    { id: 'de', folderName: 'deu' },
+    { id: 'fr', folderName: 'fra' },
+    { id: 'es', folderName: 'esn' },
+    { id: 'ru', folderName: 'rus' },
+    { id: 'it', folderName: 'ita' },
+    { id: 'pt-BR', folderName: 'ptb'}
+];
+
+const cleanTask = function() {
+	return del(['out/**', 'package.nls.*.json']);
+}
+
+const addI18nTask = function() {
+	return gulp.src(['package.nls.json'])
+        .pipe(nls.createAdditionalLanguageFiles(languages, 'i18n'))
+		.pipe(gulp.dest('.'));
+};
+
+// Creates an xlf file containing all the localized strings. This file is picked by translation pipeline.
+const exporti18n = function() {
+	return gulp.src(['package.nls.json', 'out/nls.metadata.header.json', 'out/nls.metadata.json'])
+			.pipe(nls.createXlfFiles("l10n", "l10n"))
+			.pipe(gulp.dest(path.join('src')));
+};
+
+// Use the returned xlf files for all languages and fill i18n dir with respective lang files in respective lang dir.
+const importi18n = function() {
+    return Promise.resolve(es.merge(languages.map(language => {
+        let languageId = language.localeId || language.id;
+        return gulp.src(`src/l10n/transXlf/l10n.${languageId}.xlf`, { allowEmpty: true })
+                .pipe(nls.prepareJsonFiles())
+                .pipe(gulp.dest(path.join('./i18n', language.folderName)));
+    })));
+}
+
+// generate metadata containing all localized files in src directory, to be used later by exporti18n task to create an xlf file.
+gulp.task('generate-metadata', (done) => {
+    return gulp.src([
+                config.paths.project.root + '/src/**/*.ts',
+                config.paths.project.root + '/src/**/*.js'])
+                .pipe(srcmap.init())
+                .pipe(tsProject())
+                .on('error', function() {
+                    if (process.env.BUILDMACHINE) {
+                        done('Extension Tests failed to build. See Above.');
+                        process.exit(1);
+                    }
+                })
+                .pipe(nls.rewriteLocalizeCalls())
+                .pipe(nls.bundleMetaDataFiles('postgresql-extension', 'out'))
+                .pipe(nls.bundleLanguageFiles())
+                .pipe(srcmap.write('.', {
+                   sourceRoot: function(file){ return file.cwd + '/src'; }
+                }))
+                .pipe(gulp.dest('out/'));
+});
+
 
 gulp.task('ext:lint', () => {
     return gulp.src([
@@ -26,12 +88,6 @@ gulp.task('ext:lint', () => {
     .pipe(tslint.report());
 });
 
-gulp.task('localization:process-package-json', function () {
-    return gulp.src(['package.nls.json'])
-        .pipe(nls.createAdditionalLanguageFiles(languages, 'i18n'))
-        .pipe(gulp.dest('.'));
-});
-
 gulp.task('ext:compile-src', (done) => {
     return gulp.src([
                 config.paths.project.root + '/src/**/*.ts',
@@ -71,7 +127,9 @@ gulp.task('ext:compile-tests', (done) => {
 
 });
 
-gulp.task('ext:compile', gulp.series('ext:compile-src', 'ext:compile-tests'));
+gulp.task('ext:localize', gulp.series(cleanTask, 'generate-metadata', exporti18n));
+
+gulp.task('ext:compile', gulp.series(importi18n, cleanTask, 'ext:compile-src', addI18nTask, 'ext:compile-tests'));
 
 gulp.task('ext:copy-tests', () => {
     return gulp.src(config.paths.project.root + '/test/resources/**/*')
@@ -122,7 +180,7 @@ gulp.task('clean', function (done) {
     return del('out', done);
 });
 
-gulp.task('build', gulp.series('clean', 'ext:build', 'localization:process-package-json'));
+gulp.task('build', gulp.series('clean', 'ext:build'));
 
 gulp.task('watch', function(){
     return gulp.watch(config.paths.project.root + '/src/**/*', gulp.series('build'))

gulpfile.js

@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"json.schemas.desc": "将架构关联到当前项目中的 JSON 文件",
+	"json.schemas.url.desc": "架构的 URL 或当前目录中架构的相对路径",
+	"json.schemas.fileMatch.desc": "将 JSON 文件解析到架构时用于匹配的一组文件模式。",
+	"json.schemas.fileMatch.item.desc": "将 JSON 文件解析到架构时用于匹配的可以包含 \"*\" 的文件模式。",
+	"json.schemas.schema.desc": "给定 URL 的架构定义。仅当要避免访问架构 URL 时需要提供架构。",
+	"json.format.enable.desc": "启用/禁用默认 JSON 格式化程序(需要重启)",
+	"postgres.description": "适用于 Azure Data Studio 的 PostgreSQL 扩展",
+	"postgres.logDebugInfo.description": "[可选] 将调试输出记录到 VS Code 控制台(“帮助”->“切换开发人员工具”)",
+	"postgres.configuration.title": "PostgreSQL 配置",
+	"postgres.enabled.description": "[可选] 启用 PostgreSQL 支持(当前正在开发中)",
+	"postgres.debugSourcePath.description": "[可选] PG SQL 工具服务源目录的路径，用于调试",
+	"postgres.useDebugSource.description": "[可选] 通过在 pgsql.debugSourcePath 中设置的路径支持运行 PostgreSQL 扩展",
+	"postgres.enableStartupDebugging.description": "[可选] 是否将 PG SQL 工具服务设置为在启动时等待调试器附加",
+	"postgres.debugServerPort.description": "[可选] 要运行 PG SQL 工具服务远程调试器的端口(默认值为 3000)",
+	"postgres.defaultDatabase.description": "创建新的 PostgreSQL 连接时要使用的默认数据库",
+	"postgres.format.keywordCase.description": "[可选] 更改关键字的格式设置方式。允许的值为“大写”、“小写”和“首字母大写”。",
+	"postgres.format.identifierCase.description": "[可选] 更改标识符的格式设置方式。允许的值为“大写”、“小写”和“首字母大写”。",
+	"postgres.format.stripComments.description": "[可选] 如果为 true，则从语句中移除注释",
+	"postgres.format.reindent.description": "[可选] 如果为 true，则更改语句的缩进。",
+	"postgres.provider.displayName": "PostgreSQL",
+	"postgres.connectionOptions.groupName.source": "源",
+	"postgres.connectionOptions.groupName.security": "安全性",
+	"postgres.connectionOptions.groupName.server": "服务器",
+	"postgres.connectionOptions.groupName.client": "客户端",
+	"postgres.connectionOptions.groupName.ssl": "SSL",
+	"postgres.connectionOptions.connectionName.displayName": "名称(可选)",
+	"postgres.connectionOptions.connectionName.description": "连接的自定义名称",
+	"postgres.connectionOptions.host.displayName": "服务器名称",
+	"postgres.connectionOptions.host.description": "PostgreSQL 实例的名称",
+	"postgres.connectionOptions.authenticationType.displayName": "身份验证类型",
+	"postgres.connectionOptions.authenticationType.description": "如何向服务器进行身份验证。",
+	"postgres.connectionOptions.authenticationType.password": "密码",
+	"postgres.connectionOptions.authenticationType.azuremfaanduser": "Azure Active Directory",
+	"postgres.connectionOptions.dbname.displayName": "数据库名称",
+	"postgres.connectionOptions.dbname.description": "数据源中的初始目录或数据库的名称。",
+	"postgres.connectionOptions.user.displayName": "用户名",
+	"postgres.connectionOptions.user.description": "指示连接到数据源时使用的用户 ID",
+	"postgres.connectionOptions.password.displayName": "密码",
+	"postgres.connectionOptions.password.description": "指示连接到数据源时使用的密码",
+	"postgres.connectionOptions.hostIp.displayName": "主机 IP 地址",
+	"postgres.connectionOptions.hostIp.description": "服务器的 IP 地址",
+	"postgres.connectionOptions.port.displayName": "端口",
+	"postgres.connectionOptions.port.description": "服务器端口号",
+	"postgres.connectionOptions.connectTimeout.displayName": "连接超时",
+	"postgres.connectionOptions.connectTimeout.description": "连接时超时之前要等待的秒数",
+	"postgres.connectionOptions.clientEncoding.displayName": "客户端编码",
+	"postgres.connectionOptions.clientEncoding.description": "用于连接的客户端编码",
+	"postgres.connectionOptions.options.displayName": "命令行选项",
+	"postgres.connectionOptions.options.description": "连接启动时发送到服务器的命令行选项",
+	"postgres.connectionOptions.applicationName.displayName": "应用程序名称",
+	"postgres.connectionOptions.applicationName.description": "\"application_name\" 配置参数的值",
+	"postgres.connectionOptions.ssl.displayName": "SSL 模式",
+	"postgres.connectionOptions.ssl.description": "连接时要使用的 SSL 模式",
+	"postgres.connectionOptions.ssl.mode.disable": "Disable",
+	"postgres.connectionOptions.ssl.mode.require": "Require",
+	"postgres.connectionOptions.ssl.mode.allow": "Allow",
+	"postgres.connectionOptions.ssl.mode.prefer": "Prefer",
+	"postgres.connectionOptions.ssl.mode.verify_ca": "Verify-CA",
+	"postgres.connectionOptions.ssl.mode.verify_full": "Verify-Full",
+	"postgres.connectionOptions.ssl.compression.displayName": "使用 SSL 压缩",
+	"postgres.connectionOptions.ssl.compression.description": "是否压缩 SSL 连接",
+	"postgres.connectionOptions.ssl.rootcert.displayName": "SSL 根证书文件名",
+	"postgres.connectionOptions.ssl.rootcert.description": "要使用的 SSL 根 CA 证书的文件名",
+	"postgres.connectionOptions.ssl.key.displayName": "SSL 密钥文件名",
+	"postgres.connectionOptions.ssl.key.description": "用于 SSL 证书的密钥的文件名",
+	"postgres.connectionOptions.ssl.cert.displayName": "SSL 证书文件名",
+	"postgres.connectionOptions.ssl.cert.description": "要使用的 SSL 证书的文件名",
+	"postgres.connectionOptions.ssl.crl.displayName": "SSL CRL 文件名",
+	"postgres.connectionOptions.ssl.crl.description": "要使用的 SSL 证书吊销列表的文件名",
+	"postgres.connectionOptions.requirepeer.displayName": "需要对等机",
+	"postgres.connectionOptions.requirepeer.description": "服务器进程的必需用户名",
+	"postgres.connectionOptions.service.displayName": "服务名称",
+	"postgres.connectionOptions.service.description": "用于连接参数的 pg_service.conf 中的服务名称",
+	"postgres.resourceDeployment.displayName": "Azure Database for PostgreSQL",
+	"postgres.resourceDeployment.description": "创建 Azure Database for PostgreSQL 灵活服务器 - Azure 上完全托管的 PostgreSQL 数据库即服务。",
+	"postgres.resourceDeployment.okButtonText": "在 Azure 门户中创建",
+	"postgres.resourceDeployment.agreements.template": "我接受 {0} 和 {1}。",
+	"postgres.resourceDeployment.helpTexts.template": "Azure Database for PostgreSQL 灵活服务器是由 PostgreSQL 社区版提供支持的关系数据库服务。它是一种完全托管的数据库即服务产品，可通过可预测的性能和动态可伸缩性处理任务关键型工作负载。此外，它旨在让你能够更精细地控制且更灵活地使用数据库管理功能和配置设置。{0}",
+	"microsoft.azure.termsOfUse": "Microsoft Azure 使用条款",
+	"microsoft.privacy.statement": "Microsoft 隐私声明",
+	"learnMore": "了解详细信息。",
+	"postgres.command.buildAll": "生成所有 PostgreSQL 项目",
+	"postgres.command.buildCurrent": "生成 PostgreSQL 项目",
+	"postgres.command.newProject": "新建 PostgreSQL 项目",
+	"postgres.command.deploy": "部署"
+}