Merge branch 'main' into dev/jordi1215/fix-casing-for-razorcomponentattribute

Author: Andrew Hall

.vscode/launch.json

@@ -153,7 +153,7 @@
             ],
             "env": {
                 "NEW_DEPS_ID": "OmniSharp",
-                "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip",
+                "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip",
                 "OLD_DEPS_VERSION": "1.39.10",
                 "NEW_DEPS_VERSION": "1.39.11",
             },
@@ -169,7 +169,7 @@
               "updatePackageDependencies"
           ],
           "env": {
-              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b6fa76f8ccfa8053f56f1fa3d39e78c9/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/97b57265a3097b6128aaa4be297f1243/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/fdf85820363515f55ce0f4e35a7fe780/razorlanguageserver-linux-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/48d3bef6b7f06634e53ca433be40e52a/razorlanguageserver-osx-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/581c065f415941a97c7687403da5d61c/razorlanguageserver-osx-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b2940e8871ef222b0bc820b51ec44ed2/razorlanguageserver-platformagnostic-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bbc8d2a30ba7da4e0eb4465a329b1fa1/razorlanguageserver-win-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/dc3bfe5f9473a09cb823d665193d4ff0/razorlanguageserver-win-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/7ff9016973253dd93fa52aff5d631aa5/razorlanguageserver-win-x86-7.0.0-preview.24168.4.zip",
+              "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip",
               "NEW_DEPS_VERSION": "7.0.0-preview.24168.4",
               "NEW_DEPS_ID": "Razor"
           },
@@ -185,7 +185,7 @@
             "updatePackageDependencies"
         ],
         "env": {
-            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b9a6b44701b08cd5a8b2934260f5ad59/devkittelemetry-linux-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/3569c56beb063da89dff13444964e5ee/devkittelemetry-linux-musl-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/d0eb6050d4429ba1f833bb90549d6014/devkittelemetry-linux-musl-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/5c0781c22717cbf061552947d173035e/devkittelemetry-linux-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/962eebbee4f1618b8042745af0ee252d/devkittelemetry-osx-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/aeb2b93f02a901cc3b6f0a01db5ffefa/devkittelemetry-osx-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/addbbd1ec261f5576add7369416102c4/devkittelemetry-platformagnostic-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/973b8d03917bb4256ca01c91fe3638a7/devkittelemetry-win-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/95481d73dc1be495fccce0372813edac/devkittelemetry-win-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bdc33c639e44563abf4b3996d53a3191/devkittelemetry-win-x86-7.0.0-preview.24168.4.zip",
+            "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b9a6b44701b08cd5a8b2934260f5ad59/devkittelemetry-linux-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/3569c56beb063da89dff13444964e5ee/devkittelemetry-linux-musl-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/d0eb6050d4429ba1f833bb90549d6014/devkittelemetry-linux-musl-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/5c0781c22717cbf061552947d173035e/devkittelemetry-linux-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/962eebbee4f1618b8042745af0ee252d/devkittelemetry-osx-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/aeb2b93f02a901cc3b6f0a01db5ffefa/devkittelemetry-osx-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/addbbd1ec261f5576add7369416102c4/devkittelemetry-platformagnostic-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/973b8d03917bb4256ca01c91fe3638a7/devkittelemetry-win-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/95481d73dc1be495fccce0372813edac/devkittelemetry-win-x64-7.0.0-preview.24168.4.zip",
             "NEW_DEPS_VERSION": "7.0.0-preview.24168.4",
             "NEW_DEPS_ID": "RazorTelemetry"
         },

azure-pipelines-official.yml

@@ -5,17 +5,39 @@ trigger:
     - release
     - prerelease
 pr: none
-
 parameters:
-  # Allows the version number to be set manually for a specific build.
-  # Useful when we need to create an updated extension version with no changes (for example to fix a bad partial release).
-  - name: versionNumberOverride
-    type: string
-    default: 'default'
+# Allows the version number to be set manually for a specific build.
+# Useful when we need to create an updated extension version with no changes (for example to fix a bad partial release).
+- name: versionNumberOverride
+  type: string
+  default: 'default'
+# Allows the marketplace release channel to be set manually for a specific build
+# Auto will determine the release channel based on the branch.
+- name: channel
+  values:
+  - release
+  - prerelease
+  - auto
+  default: auto
 
-stages:
-- template: azure-pipelines/build-all.yml
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
   parameters:
-    versionNumberOverride: ${{ parameters.versionNumberOverride }}
-
-# TODO: add compliance, signing.
+    pool:
+      name: netcore1espool-internal
+      image: 1es-windows-2022-pt
+      os: windows
+    customBuildTags:
+    - ES365AIMigrationTooling
+    stages:
+    - template: /azure-pipelines/build-all.yml@self
+      parameters:
+        versionNumberOverride: ${{ parameters.versionNumberOverride }}
+        isOfficial: true
+        channel: ${{ parameters.channel }}

azure-pipelines.yml

@@ -15,6 +15,8 @@ pr:
 
 stages:
 - template: azure-pipelines/build-all.yml
+  parameters:
+    isOfficial: false
 
 - stage: Test
   displayName: Test

azure-pipelines/build-all.yml

@@ -2,24 +2,94 @@ parameters:
 - name: versionNumberOverride
   type: string
   default: 'default'
-
+- name: isOfficial
+  type: boolean
+- name: channel
+  values:
+  - release
+  - prerelease
+  - auto
+  default: auto
 stages:
 - stage: Build
   displayName: 'Build VSIXs'
   dependsOn: []
   jobs:
-  - template: build.yml
+  - job: SetChannelVariable
+    displayName: 'Set Channel Variable'
+    pool:
+      ${{ if eq(parameters.isOfficial, true) }}:
+        name: netcore1espool-internal
+        image: 1es-ubuntu-2204-pt
+      ${{ else }}:
+        name: Azure Pipelines
+        vmImage: ubuntu-latest
+      os: linux
+    steps:
+    - pwsh: |
+        $isPrerelease = $true
+        if ("${{ parameters.channel }}" -eq "release") {
+          Write-Host "Channel override set to release, using release channel."
+          $isPrerelease = $false
+        } elseif ("${{ parameters.channel }}" -eq "prerelease") {
+          Write-Host "Channel override set to prerelease, using prerelease channel."
+          $isPrerelease = $true
+        } else {
+          Write-Host "Channel override is ${{ parameters.channel }}, using branch configuration to determine release channel."
+          Write-Host "Detected branch $(Build.SourceBranchName)"
+          if ("$(Build.SourceBranchName)" -eq "release") {
+            Write-Host "Branch is release, using release channel."
+            $isPrerelease = $false
+          } else {
+            Write-Host "Branch is not release, using prerelease channel."
+            $isPrerelease = $true
+          }
+        }
+
+        if ( $isPrerelease ) {
+          Write-Host "Setting pipeline channel variable to Prerelease."
+          Write-Host "##vso[task.setvariable variable=channel;isoutput=true]Prerelease"
+        } else {
+          Write-Host "Setting pipeline channel variable to Release."
+          Write-Host "##vso[task.setvariable variable=channel;isoutput=true]Release"
+        }
+      name: passOutput
+      
+  - template: /azure-pipelines/build.yml@self
     parameters:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
-      vmImageName: ubuntu-latest
       platform: linux
-  - template: build.yml
+      isOfficial: ${{ parameters.isOfficial }}
+      pool:
+        ${{ if eq(parameters.isOfficial, true) }}:
+          name: netcore1espool-internal
+          image: 1es-ubuntu-2204-pt
+        ${{ else }}:
+          name: Azure Pipelines
+          vmImage: ubuntu-latest
+        os: linux
+  - template: /azure-pipelines/build.yml@self
     parameters:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
-      vmImageName: windows-latest
       platform: windows
-  - template: build.yml
+      isOfficial: ${{ parameters.isOfficial }}
+      pool:
+        ${{ if eq(parameters.isOfficial, true) }}:
+          name: netcore1espool-internal
+          image: 1es-windows-2022-pt
+        ${{ else }}:
+          name: Azure Pipelines
+          vmImage: windows-latest
+        os: windows
+  - template: /azure-pipelines/build.yml@self
     parameters:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
-      vmImageName: macOS-latest
       platform: darwin
+      isOfficial: ${{ parameters.isOfficial }}
+      pool:
+        name: Azure Pipelines
+        ${{ if eq(parameters.isOfficial, true) }}:
+          image: macOS-latest
+        ${{ else }}:
+          vmImage: macOS-latest
+        os: macOS

azure-pipelines/build.yml

@@ -2,68 +2,52 @@ parameters:
 - name: versionNumberOverride
   type: string
   default: 'default'
-- name: vmImageName
-  type: string
-  default: ''
 - name: platform
   type: string
+- name: pool
+  type: object
+- name: isOfficial
+  type: boolean
 
 jobs:
-- job:
-  displayName: 'Build ${{ parameters.platform }} prerelease vsixs'
-  pool:
-    name: Azure Pipelines
-    vmImage: ${{ parameters.vmImageName }}
-  steps:
-  - checkout: self
-    clean: true
-    submodules: true
-    fetchTags: false
-    fetchDepth: 0
-
-  - template: prereqs.yml
-    parameters:
-      versionNumberOverride: ${{ parameters.versionNumberOverride }}
-
-  - script: gulp vsix:release:package:${{ parameters.platform }} --prerelease
-    displayName: 'Build VSIXs'
-
-  - task: PublishBuildArtifacts@1
-    condition: succeeded()
-    displayName: 'Publish VSIXs'
-    inputs:
-      PathtoPublish: '$(Build.SourcesDirectory)/vsix'
-      ArtifactName: 'VSIX_Prerelease'
-
-  - script: npm run test:artifacts
-    displayName: 'Run artifacts tests'
-
-- job:
-  displayName: 'Build ${{ parameters.platform }} release vsixs'
-  pool:
-    name: Azure Pipelines
-    vmImage: ${{ parameters.vmImageName }}
+- job: 'Build_${{ parameters.platform }}_vsixs'
+  pool: ${{ parameters.pool }}
+  displayName: 'Build ${{ parameters.platform }} vsixs'
+  dependsOn: SetChannelVariable
+  variables:
+    channel: $[ dependencies.SetChannelVariable.outputs['passOutput.channel'] ]
   steps:
   - checkout: self
     clean: true
     submodules: true
     fetchTags: false
     fetchDepth: 0
-
-  - template: prereqs.yml
+  - template: /azure-pipelines/prereqs.yml@self
     parameters:
       versionNumberOverride: ${{ parameters.versionNumberOverride }}
-
-  - script: gulp vsix:release:package:${{ parameters.platform }}
+  - pwsh: |
+      Write-Host "Building VSIXs for platform ${{ parameters.platform }} and channel $(channel)"
+      if ("$(channel)" -eq "Release") {
+        gulp vsix:release:package:${{ parameters.platform }}
+      } else {
+        gulp vsix:release:package:${{ parameters.platform }} --prerelease
+      }
     displayName: 'Build VSIXs'
 
-  - task: PublishBuildArtifacts@1
-    condition: succeeded()
-    displayName: 'Publish VSIXs'
-    inputs:
-      PathtoPublish: '$(Build.SourcesDirectory)/vsix'
-      ArtifactName: 'VSIX_Release'
+  - ${{ if eq(parameters.isOfficial, true) }}:
+    - task: 1ES.PublishBuildArtifacts@1
+      condition: succeeded()
+      displayName: 'Publish VSIXs'
+      inputs:
+        PathtoPublish: '$(Build.SourcesDirectory)/vsix'
+        ArtifactName: 'VSIX_$(channel)'
+  - ${{ else }}:
+    - task: PublishBuildArtifacts@1
+      condition: succeeded()
+      displayName: 'Publish VSIXs'
+      inputs:
+        PathtoPublish: '$(Build.SourcesDirectory)/vsix'
+        ArtifactName: 'VSIX_$(channel)'
 
   - script: npm run test:artifacts
-    displayName: 'Run artifacts tests'
-  
+    displayName: 'Run artifacts tests'