Skip to content

Commit 627a750

Browse files
bschnurrbschnurr
committed
fix linting and lint check quotes
1 parent 11ffe84 commit 627a750

File tree

7 files changed

+396
-396
lines changed

7 files changed

+396
-396
lines changed

‎build/templates/createGitHubRelease.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ steps:
1414
action: edit # Creates a new release if one does not exist (https://github.com/microsoft/azure-pipelines-tasks/blob/master/Tasks/GitHubReleaseV1/main.ts#85)
1515
addChangelog: ${{ parameters.ghReleaseAddChangeLog }}
1616
changeLogType: issueBased
17-
changeLogLabels : '[{ "label" : "feature-request", "displayName" : "Feature Requests", "state" : "closed" }, { "label" : "bug", "displayName" : "Bugs", "state" : "closed" }]'
17+
changeLogLabels: '[{ "label" : "feature-request", "displayName" : "Feature Requests", "state" : "closed" }, { "label" : "bug", "displayName" : "Bugs", "state" : "closed" }]'
1818
tagSource: userSpecifiedTag
1919
tag: ${{ parameters.tagName }}
2020
title: ${{ parameters.tagName }}
@@ -24,4 +24,4 @@ steps:
2424
${{ else }}:
2525
changeLogCompareToRelease: lastFullRelease
2626
displayName: 🐙 Github release
27-
continueOnError: true
27+
continueOnError: true

‎build/templates/modify-extension-version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ steps:
2828
# Build number format: YYYYMMDD.R (e.g., 20260112.3)
2929
$buildNumber = '$(Build.BuildNumber)'
3030
$dateSegment, $revisionSegment = $buildNumber -split '\.'
31-
31+
3232
# Combine date + zero-padded revision to form the patch version
3333
# e.g., 20260112 + 03 = 2026011203
3434
$patch = $dateSegment + ($revisionSegment.PadLeft(2, '0'))
@@ -39,4 +39,4 @@ steps:
3939
$prereleasePackageJson = $json | Add-Member -NotePropertyMembers $newProps -PassThru -Force
4040
$prereleasePackageJson | ConvertTo-Json -Depth 100 | Set-Content $packagejsonPath
4141
displayName: Update the extension version in package.json
42-
workingDirectory: ${{ parameters.workingDirectory }}
42+
workingDirectory: ${{ parameters.workingDirectory }}

‎build/templates/package.yml‎

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -37,97 +37,97 @@ parameters:
3737

3838
jobs:
3939
- ${{ each platform in parameters.buildPlatforms }}:
40-
- job: Build_${{ replace(coalesce(platform.vsceTarget, 'universal'), '-', '_') }}
41-
displayName: 'Build ${{ coalesce(platform.vsceTarget, ''universal'') }}'
42-
43-
${{ if eq(platform.name, 'Linux') }}:
44-
pool:
45-
name: AzurePipelines-EO
46-
image: 1ESPT-Ubuntu22.04
47-
os: linux
48-
49-
${{ if eq(platform.name, 'MacOS') }}:
50-
pool:
51-
name: Azure Pipelines
52-
image: macos-latest
53-
os: macOS
54-
55-
${{ if eq(platform.name, 'Windows') }}:
56-
pool:
57-
name: AzurePipelines-EO
58-
image: 1ESPT-Windows2022
59-
os: windows
60-
61-
variables:
62-
packageArch: ${{ coalesce(platform.packageArch, '') }}
63-
vsceTarget: ${{ platform.vsceTarget }}
64-
${{ if eq(platform.name, 'MacOS') }}:
65-
BUILDSECMON_OPT_IN: false
66-
67-
templateContext:
68-
outputs:
69-
- output: pipelineArtifact
70-
displayName: 'Publish VSIX for ${{ coalesce(platform.vsceTarget, ''universal'') }}'
71-
targetPath: '$(Build.ArtifactStagingDirectory)/drop'
72-
artifactName: vsix-${{ coalesce(platform.vsceTarget, 'universal') }}
73-
74-
steps:
75-
- template: setup.yml@self
40+
- job: Build_${{ replace(coalesce(platform.vsceTarget, 'universal'), '-', '_') }}
41+
displayName: "Build ${{ coalesce(platform.vsceTarget, 'universal') }}"
7642

77-
- ${{ if and(eq(parameters.isPreRelease, 'true'), eq(parameters.standardizedVersioning, 'true')) }}:
78-
- template: modify-extension-version.yml@self
79-
parameters:
80-
workingDirectory: ${{ parameters.workingDirectory }}
43+
${{ if eq(platform.name, 'Linux') }}:
44+
pool:
45+
name: AzurePipelines-EO
46+
image: 1ESPT-Ubuntu22.04
47+
os: linux
8148

82-
- bash: |
83-
echo "##vso[task.setvariable variable=VSCETARGET]${{ platform.vsceTarget }}"
84-
echo "Building for target: ${{ platform.vsceTarget }}"
85-
displayName: 'Set VSCETARGET variable'
86-
87-
- ${{ each buildStep in parameters.buildSteps }}:
88-
- ${{ buildStep }}
89-
90-
- ${{ if eq(platform.vsceTarget, '') }}:
91-
- bash: |
92-
VSIX=$(node -p "require(\"./package.json\").publisher + \".\" + require(\"./package.json\").name + \".\" + require(\"./package.json\").version + \".universal.vsix\"")
93-
echo "##vso[task.setvariable variable=VSIX;isOutput=true]$VSIX"
94-
name: SetExtensionName
95-
displayName: 🗄 Set VSIX file name
96-
workingDirectory: ${{ parameters.workingDirectory }}
97-
98-
- ${{ if ne(platform.vsceTarget, '') }}:
99-
- bash: |
100-
VSIX=$(node -p "require(\"./package.json\").publisher + \".\" + require(\"./package.json\").name + \".\" + require(\"./package.json\").version + \".\" + \"${{ platform.vsceTarget }}\" + \".vsix\"")
101-
echo "##vso[task.setvariable variable=VSIX;isOutput=true]$VSIX"
102-
name: SetExtensionName
103-
displayName: 🗄 Set VSIX file name
104-
workingDirectory: ${{ parameters.workingDirectory }}
105-
106-
- ${{ if eq(parameters.isPreRelease, false) }}:
107-
- ${{ if eq(platform.vsceTarget, '') }}:
108-
- script: npx @vscode/vsce@latest package -o $(Build.BinariesDirectory)/$(SetExtensionName.VSIX) ${{ parameters.vscePackageArgs }}
109-
displayName: 💾 Package extension
49+
${{ if eq(platform.name, 'MacOS') }}:
50+
pool:
51+
name: Azure Pipelines
52+
image: macos-latest
53+
os: macOS
54+
55+
${{ if eq(platform.name, 'Windows') }}:
56+
pool:
57+
name: AzurePipelines-EO
58+
image: 1ESPT-Windows2022
59+
os: windows
60+
61+
variables:
62+
packageArch: ${{ coalesce(platform.packageArch, '') }}
63+
vsceTarget: ${{ platform.vsceTarget }}
64+
${{ if eq(platform.name, 'MacOS') }}:
65+
BUILDSECMON_OPT_IN: false
66+
67+
templateContext:
68+
outputs:
69+
- output: pipelineArtifact
70+
displayName: "Publish VSIX for ${{ coalesce(platform.vsceTarget, 'universal') }}"
71+
targetPath: '$(Build.ArtifactStagingDirectory)/drop'
72+
artifactName: vsix-${{ coalesce(platform.vsceTarget, 'universal') }}
73+
74+
steps:
75+
- template: setup.yml@self
76+
77+
- ${{ if and(eq(parameters.isPreRelease, 'true'), eq(parameters.standardizedVersioning, 'true')) }}:
78+
- template: modify-extension-version.yml@self
79+
parameters:
11080
workingDirectory: ${{ parameters.workingDirectory }}
11181

112-
- ${{ if ne(platform.vsceTarget, '') }}:
113-
- script: npx @vscode/vsce@latest package -o $(Build.BinariesDirectory)/$(SetExtensionName.VSIX) --target ${{ platform.vsceTarget }} ${{ parameters.vscePackageArgs }}
114-
displayName: 💾 Package extension
115-
workingDirectory: ${{ parameters.workingDirectory }}
82+
- bash: |
83+
echo "##vso[task.setvariable variable=VSCETARGET]${{ platform.vsceTarget }}"
84+
echo "Building for target: ${{ platform.vsceTarget }}"
85+
displayName: 'Set VSCETARGET variable'
11686
117-
- ${{ if eq(parameters.isPreRelease, true) }}:
118-
- ${{ if eq(platform.vsceTarget, '') }}:
119-
- script: npx @vscode/vsce@latest package -o $(Build.BinariesDirectory)/$(SetExtensionName.VSIX) --pre-release ${{ parameters.vscePackageArgs }}
120-
displayName: 💾 Package pre-release extension
121-
workingDirectory: ${{ parameters.workingDirectory }}
87+
- ${{ each buildStep in parameters.buildSteps }}:
88+
- ${{ buildStep }}
12289

123-
- ${{ if ne(platform.vsceTarget, '') }}:
124-
- script: npx @vscode/vsce@latest package -o $(Build.BinariesDirectory)/$(SetExtensionName.VSIX) --target ${{ platform.vsceTarget }} --pre-release ${{ parameters.vscePackageArgs }}
125-
displayName: 💾 Package pre-release extension
126-
workingDirectory: ${{ parameters.workingDirectory }}
90+
- ${{ if eq(platform.vsceTarget, '') }}:
91+
- bash: |
92+
VSIX=$(node -p "require(\"./package.json\").publisher + \".\" + require(\"./package.json\").name + \".\" + require(\"./package.json\").version + \".universal.vsix\"")
93+
echo "##vso[task.setvariable variable=VSIX;isOutput=true]$VSIX"
94+
name: SetExtensionName
95+
displayName: 🗄 Set VSIX file name
96+
workingDirectory: ${{ parameters.workingDirectory }}
97+
98+
- ${{ if ne(platform.vsceTarget, '') }}:
99+
- bash: |
100+
VSIX=$(node -p "require(\"./package.json\").publisher + \".\" + require(\"./package.json\").name + \".\" + require(\"./package.json\").version + \".\" + \"${{ platform.vsceTarget }}\" + \".vsix\"")
101+
echo "##vso[task.setvariable variable=VSIX;isOutput=true]$VSIX"
102+
name: SetExtensionName
103+
displayName: 🗄 Set VSIX file name
104+
workingDirectory: ${{ parameters.workingDirectory }}
127105
128-
- task: CopyFiles@2
129-
inputs:
130-
sourceFolder: $(Build.BinariesDirectory)
131-
contents: '*.vsix'
132-
targetFolder: $(Build.ArtifactStagingDirectory)/drop
133-
displayName: 📦 Copy VSIX to staging
106+
- ${{ if eq(parameters.isPreRelease, false) }}:
107+
- ${{ if eq(platform.vsceTarget, '') }}:
108+
- script: npx @vscode/vsce@latest package -o $(Build.BinariesDirectory)/$(SetExtensionName.VSIX) ${{ parameters.vscePackageArgs }}
109+
displayName: 💾 Package extension
110+
workingDirectory: ${{ parameters.workingDirectory }}
111+
112+
- ${{ if ne(platform.vsceTarget, '') }}:
113+
- script: npx @vscode/vsce@latest package -o $(Build.BinariesDirectory)/$(SetExtensionName.VSIX) --target ${{ platform.vsceTarget }} ${{ parameters.vscePackageArgs }}
114+
displayName: 💾 Package extension
115+
workingDirectory: ${{ parameters.workingDirectory }}
116+
117+
- ${{ if eq(parameters.isPreRelease, true) }}:
118+
- ${{ if eq(platform.vsceTarget, '') }}:
119+
- script: npx @vscode/vsce@latest package -o $(Build.BinariesDirectory)/$(SetExtensionName.VSIX) --pre-release ${{ parameters.vscePackageArgs }}
120+
displayName: 💾 Package pre-release extension
121+
workingDirectory: ${{ parameters.workingDirectory }}
122+
123+
- ${{ if ne(platform.vsceTarget, '') }}:
124+
- script: npx @vscode/vsce@latest package -o $(Build.BinariesDirectory)/$(SetExtensionName.VSIX) --target ${{ platform.vsceTarget }} --pre-release ${{ parameters.vscePackageArgs }}
125+
displayName: 💾 Package pre-release extension
126+
workingDirectory: ${{ parameters.workingDirectory }}
127+
128+
- task: CopyFiles@2
129+
inputs:
130+
sourceFolder: $(Build.BinariesDirectory)
131+
contents: '*.vsix'
132+
targetFolder: $(Build.ArtifactStagingDirectory)/drop
133+
displayName: 📦 Copy VSIX to staging

‎build/templates/publish-extension.yml‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -130,19 +130,19 @@ jobs:
130130
steps:
131131
# Download platform-specific artifacts to Build.BinariesDirectory
132132
- ${{ each platform in parameters.buildPlatforms }}:
133-
- ${{ if eq(platform.vsceTarget, '') }}:
134-
- task: DownloadPipelineArtifact@2
135-
inputs:
136-
artifactName: vsix-universal
137-
targetPath: $(Build.BinariesDirectory)/vsix-universal
138-
displayName: 🚛 Download extension (universal)
139-
140-
- ${{ if ne(platform.vsceTarget, '') }}:
141-
- task: DownloadPipelineArtifact@2
142-
inputs:
143-
artifactName: vsix-${{ platform.vsceTarget }}
144-
targetPath: $(Build.BinariesDirectory)/vsix-${{ platform.vsceTarget }}
145-
displayName: 🚛 Download extension (${{ platform.vsceTarget }})
133+
- ${{ if eq(platform.vsceTarget, '') }}:
134+
- task: DownloadPipelineArtifact@2
135+
inputs:
136+
artifactName: vsix-universal
137+
targetPath: $(Build.BinariesDirectory)/vsix-universal
138+
displayName: 🚛 Download extension (universal)
139+
140+
- ${{ if ne(platform.vsceTarget, '') }}:
141+
- task: DownloadPipelineArtifact@2
142+
inputs:
143+
artifactName: vsix-${{ platform.vsceTarget }}
144+
targetPath: $(Build.BinariesDirectory)/vsix-${{ platform.vsceTarget }}
145+
displayName: 🚛 Download extension (${{ platform.vsceTarget }})
146146

147147
- template: sign.yml
148148
parameters:
@@ -154,65 +154,65 @@ jobs:
154154

155155
# Job 2: Publish to marketplace
156156
- ${{ if eq(parameters.publishExtension, true) }}:
157-
- job: Publish
158-
displayName: Publish to Marketplace and GitHub
159-
dependsOn: Sign
160-
pool:
161-
name: AzurePipelines-EO
162-
image: 1ESPT-Windows2022
163-
os: windows
164-
templateContext:
165-
type: releaseJob # This makes a job a release job
166-
isProduction: true # Indicates a production release
167-
steps:
168-
- task: 1ES.DownloadPipelineArtifact@1
169-
inputs:
170-
artifactName: extension
171-
targetPath: $(Build.ArtifactStagingDirectory)/${{ parameters.publishFolder }}
172-
displayName: 🚛 Download signed extension
173-
174-
# Extract VSIX to read publisher/version for GitHub release tagging.
175-
# Use Agent.TempDirectory to avoid reusing Build.ArtifactStagingDirectory which
176-
# is reserved for final artifact staging.
177-
- task: ExtractFiles@1
178-
inputs:
179-
archiveFilePatterns: $(Build.ArtifactStagingDirectory)/${{ parameters.publishFolder }}/**/*.vsix
180-
destinationFolder: $(Agent.TempDirectory)/vsix-extracted
181-
cleanDestinationFolder: true
182-
overwriteExistingFiles: true
183-
displayName: 📦 Extract VSIX package
184-
185-
- pwsh: |
186-
$extensionDir = Get-ChildItem -Path . -Directory -Filter 'extension*' | Select-Object -First 1
187-
if (-not $extensionDir) {
188-
throw "Could not find extracted extension folder under: $PWD"
189-
}
190-
191-
$packageJsonPath = Join-Path $extensionDir.FullName 'package.json'
192-
if (-not (Test-Path $packageJsonPath)) {
193-
throw "Could not find package.json at: $packageJsonPath"
194-
}
195-
196-
$package = Get-Content $packageJsonPath -Raw | ConvertFrom-Json
197-
Write-Host "##vso[task.setvariable variable=publisher;isOutput=true]$($package.publisher)"
198-
Write-Host "##vso[task.setvariable variable=version;isOutput=true]$($package.version)"
199-
name: SetPublisherAndVersion
200-
displayName: 📋 Get Publisher & Version
201-
workingDirectory: $(Agent.TempDirectory)/vsix-extracted
202-
203-
# Get version from package.json for GitHub release tagging
204-
- ${{ if and(eq(parameters.ghCreateTag, true), eq(parameters.ghCreateRelease, true)) }}:
205-
- template: createGitHubRelease.yml
157+
- job: Publish
158+
displayName: Publish to Marketplace and GitHub
159+
dependsOn: Sign
160+
pool:
161+
name: AzurePipelines-EO
162+
image: 1ESPT-Windows2022
163+
os: windows
164+
templateContext:
165+
type: releaseJob # This makes a job a release job
166+
isProduction: true # Indicates a production release
167+
steps:
168+
- task: 1ES.DownloadPipelineArtifact@1
169+
inputs:
170+
artifactName: extension
171+
targetPath: $(Build.ArtifactStagingDirectory)/${{ parameters.publishFolder }}
172+
displayName: 🚛 Download signed extension
173+
174+
# Extract VSIX to read publisher/version for GitHub release tagging.
175+
# Use Agent.TempDirectory to avoid reusing Build.ArtifactStagingDirectory which
176+
# is reserved for final artifact staging.
177+
- task: ExtractFiles@1
178+
inputs:
179+
archiveFilePatterns: $(Build.ArtifactStagingDirectory)/${{ parameters.publishFolder }}/**/*.vsix
180+
destinationFolder: $(Agent.TempDirectory)/vsix-extracted
181+
cleanDestinationFolder: true
182+
overwriteExistingFiles: true
183+
displayName: 📦 Extract VSIX package
184+
185+
- pwsh: |
186+
$extensionDir = Get-ChildItem -Path . -Directory -Filter 'extension*' | Select-Object -First 1
187+
if (-not $extensionDir) {
188+
throw "Could not find extracted extension folder under: $PWD"
189+
}
190+
191+
$packageJsonPath = Join-Path $extensionDir.FullName 'package.json'
192+
if (-not (Test-Path $packageJsonPath)) {
193+
throw "Could not find package.json at: $packageJsonPath"
194+
}
195+
196+
$package = Get-Content $packageJsonPath -Raw | ConvertFrom-Json
197+
Write-Host "##vso[task.setvariable variable=publisher;isOutput=true]$($package.publisher)"
198+
Write-Host "##vso[task.setvariable variable=version;isOutput=true]$($package.version)"
199+
name: SetPublisherAndVersion
200+
displayName: 📋 Get Publisher & Version
201+
workingDirectory: $(Agent.TempDirectory)/vsix-extracted
202+
203+
# Get version from package.json for GitHub release tagging
204+
- ${{ if and(eq(parameters.ghCreateTag, true), eq(parameters.ghCreateRelease, true)) }}:
205+
- template: createGitHubRelease.yml
206+
parameters:
207+
isPreRelease: ${{ parameters.preRelease }}
208+
ghReleaseAddChangeLog: ${{ parameters.ghReleaseAddChangeLog }}
209+
tagName: ${{ parameters.ghTagPrefix }}$(SetPublisherAndVersion.version)
210+
211+
- template: publish.yml
206212
parameters:
207-
isPreRelease: ${{ parameters.preRelease }}
208-
ghReleaseAddChangeLog: ${{ parameters.ghReleaseAddChangeLog }}
209-
tagName: ${{ parameters.ghTagPrefix }}$(SetPublisherAndVersion.version)
210-
211-
- template: publish.yml
212-
parameters:
213-
azureSubscription: ${{ parameters.azureSubscription }}
214-
buildPlatforms: ${{ parameters.buildPlatforms }}
215-
manifestName: ${{ parameters.manifestName }}
216-
signatureName: ${{ parameters.signatureName }}
217-
publishFolder: ${{ parameters.publishFolder }}
218-
preRelease: ${{ parameters.preRelease }}
213+
azureSubscription: ${{ parameters.azureSubscription }}
214+
buildPlatforms: ${{ parameters.buildPlatforms }}
215+
manifestName: ${{ parameters.manifestName }}
216+
signatureName: ${{ parameters.signatureName }}
217+
publishFolder: ${{ parameters.publishFolder }}
218+
preRelease: ${{ parameters.preRelease }}

0 commit comments

Comments
 (0)