Merged PR 474704: Merge prerelease CI changes into main branch

Author: dibarbet

.vscodeignore

@@ -24,6 +24,7 @@ azure-pipelines
 
 .editorconfig
 .gitignore
+CODEOWNERS
 gulpfile.ts
 !install.Lock
 ISSUE_TEMPLATE
@@ -35,6 +36,7 @@ package-lock.json
 package.json
 tsconfig.json
 tslint.json
+version.json
 wallaby.js
 webpack.config.js
 

azure-pipelines.yml

@@ -3,9 +3,17 @@ trigger:
   branches:
     include:
     - feature/*
+    - prerelease
+    - release
 
 pr:
 - feature/*
+- prerelease
+- release
+
+variables:
+  - name: prereleaseFlag
+    value: '--prerelease'
 
 stages:
 - stage: Build
@@ -14,6 +22,8 @@ stages:
   - job: Build
     steps:
     - template: azure-pipelines/build.yml
+      parameters:
+        prereleaseFlag: $(prereleaseFlag)
 
 - stage: Test
   displayName: Test

azure-pipelines/build.yml

@@ -1,3 +1,7 @@
+parameters:
+- name: prereleaseFlag
+  type: string
+
 steps:
 - checkout: self
   clean: true
@@ -7,7 +11,7 @@ steps:
 
 - template: prereqs.yml
 
-- script: gulp 'vsix:release:package'
+- script: gulp 'vsix:release:package' ${{ parameters.prereleaseFlag }}
   displayName: 'Build VSIXs'
 
 - task: PublishPipelineArtifact@1

azure-pipelines/prereqs.yml

@@ -8,6 +8,13 @@ steps:
   inputs:
     versionSpec: '16.x'
 
+- task: UseDotNet@2
+
+# Set the CI build number to the VSIX version we're creating from this build.
+- script: |
+    dotnet tool install --tool-path $(Agent.BuildDirectory) nbgv
+    $(Agent.BuildDirectory)/nbgv cloud
+
 - script: |
     npm ci
     npm i -g gulp

tasks/offlinePackagingTasks.ts

@@ -158,6 +158,11 @@ async function doPackageOffline() {
     console.log(versionInfo.npmPackageVersion);
     await nbgv.setPackageVersion();
 
+    let prerelease = false;
+    if (argv.prerelease) {
+        prerelease = true;
+    }
+
     try {
         // Now that we've updated the version, get the package.json.
         const packageJSON = getPackageJSON();
@@ -169,7 +174,7 @@ async function doPackageOffline() {
                     continue;
                 }
 
-                await buildVsix(packageJSON, packedVsixOutputRoot, p.vsceTarget, p.platformInfo);
+                await buildVsix(packageJSON, packedVsixOutputRoot, prerelease, p.vsceTarget, p.platformInfo);
             }
             catch (err) {
                 const message = (err instanceof Error ? err.stack : err) ?? '<unknown error>';
@@ -180,7 +185,7 @@ async function doPackageOffline() {
         }
 
         // Also output the platform neutral VSIX using the platform neutral server bits we created before.
-        await buildVsix(packageJSON, packedVsixOutputRoot);
+        await buildVsix(packageJSON, packedVsixOutputRoot, prerelease);
     }
     finally {
         // Reset package version to the placeholder value.
@@ -196,7 +201,7 @@ async function cleanAsync(deleteVsix: boolean) {
     }
 }
 
-async function buildVsix(packageJSON: any, outputFolder: string, vsceTarget?: string, platformInfo?: PlatformInformation) {
+async function buildVsix(packageJSON: any, outputFolder: string, prerelease: boolean, vsceTarget?: string, platformInfo?: PlatformInformation) {
     await cleanAsync(false);
 
     await installRoslyn(packageJSON, platformInfo);
@@ -207,7 +212,7 @@ async function buildVsix(packageJSON: any, outputFolder: string, vsceTarget?: st
     }
 
     const packageFileName = getPackageName(packageJSON, vsceTarget);
-    await createPackageAsync(outputFolder, packageFileName, vsceTarget);
+    await createPackageAsync(outputFolder, prerelease, packageFileName, vsceTarget);
 }
 
 function getPackageName(packageJSON: any, vscodePlatformId?: string) {

tasks/vsceTasks.ts

@@ -10,7 +10,7 @@ import spawnNode from '../tasks/spawnNode';
 import { vscePath } from './projectPaths';
 
 /// Packaging (VSIX) Tasks
-export async function createPackageAsync(outputFolder: string, packageName?: string, vscodePlatformId?: string) {
+export async function createPackageAsync(outputFolder: string, prerelease: boolean, packageName?: string, vscodePlatformId?: string) {
 
     let vsceArgs = [];
     let packagePath = undefined;
@@ -44,6 +44,10 @@ export async function createPackageAsync(outputFolder: string, packageName?: str
         vsceArgs.push(vscodePlatformId);
     }
 
+    if (prerelease) {
+        vsceArgs.push("--pre-release");
+    }
+
     vsceArgs.push('--baseContentUrl', 'https://devdiv.visualstudio.com/DevDiv/_git/vscode-csharp-next?path=/');
 
     const spawnResult = await spawnNode(vsceArgs);

version.json

@@ -1,3 +1,12 @@
 {
-    "version": "2.0-beta"
+	"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+	"version": "2.0-beta",
+	"publicReleaseRefSpec": [
+		"^refs/heads/release$"
+	],
+	"cloudBuild": {
+		"buildNumber": {
+			"enabled": false
+		}
+	}
 }