Merge branch 'main' into seanmcm/signVsix

Author: Colengms

Build/cg/cg.yml

@@ -102,6 +102,10 @@ extends:
             filename: mkdir
             arguments: $(Build.ArtifactStagingDirectory)\Extension
 
+        - script: yarn run vsix-prepublish
+          displayName: Build files
+          workingDirectory: $(Build.SourcesDirectory)\Extension
+
         - task: CmdLine@1
           name: ProcessRunner_12
           displayName: Run VSCE to package vsix

Extension/package.json

@@ -6471,7 +6471,7 @@
         "compile": "yarn install && (yarn verify prep --quiet || yarn prep) && yarn build",
         "watch": "yarn install && (yarn verify prep --quiet || yarn prep) && tsc --build tsconfig.json --watch",
         "rebuild": "yarn install && yarn clean && yarn prep && yarn build",
-        "vscode:prepublish": "yarn install && yarn clean && yarn webpack",
+        "vsix-prepublish": "yarn install && yarn clean && yarn webpack",
         "webpack": "yarn install && (yarn verify prep --quiet || yarn prep) && tsc --build ui.tsconfig.json && webpack --mode production --env vscode_nls",
         "generate-native-strings": "ts-node -T ./.scripts/generateNativeStrings.ts",
         "generate-options-schema": "ts-node -T ./.scripts/generateOptionsSchema.ts",