diff --git a/.config/1espt/PipelineAutobaseliningConfig.yml b/.config/1espt/PipelineAutobaseliningConfig.yml new file mode 100644 index 000000000..4b570e4e9 --- /dev/null +++ b/.config/1espt/PipelineAutobaseliningConfig.yml @@ -0,0 +1,35 @@ +## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details. + +pipelines: + 1275: + retail: + source: + credscan: + lastModifiedDate: 2024-03-18 + eslint: + lastModifiedDate: 2024-03-18 + armory: + lastModifiedDate: 2024-03-18 + binary: + credscan: + lastModifiedDate: 2024-03-18 + binskim: + lastModifiedDate: 2024-03-18 + 1264: + retail: + source: + credscan: + lastModifiedDate: 2024-03-19 + eslint: + lastModifiedDate: 2024-03-19 + psscriptanalyzer: + lastModifiedDate: 2024-03-19 + armory: + lastModifiedDate: 2024-03-19 + binary: + credscan: + lastModifiedDate: 2024-03-19 + binskim: + lastModifiedDate: 2024-03-19 + spotbugs: + lastModifiedDate: 2024-03-19 diff --git a/.config/guardian/.gdnbaselines b/.config/guardian/.gdnbaselines new file mode 100644 index 000000000..032643c03 --- /dev/null +++ b/.config/guardian/.gdnbaselines @@ -0,0 +1,29 @@ +{ + "properties": { + "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines" + }, + "version": "1.0.0", + "baselines": { + "default": { + "name": "default", + "createdDate": "2024-03-18 18:32:58Z", + "lastUpdatedDate": "2024-03-18 18:32:58Z" + } + }, + "results": { + "d6ffb0614846153cf3cc5936d0444ed9eda6fe6854febb4c8ea59243c120b223": { + "signature": "d6ffb0614846153cf3cc5936d0444ed9eda6fe6854febb4c8ea59243c120b223", + "alternativeSignatures": [], + "target": "omnisharptest/omnisharpUnitTests/testAssets/private.pem", + "line": 1, + "memberOf": [ + "default" + ], + "tool": "credscan", + "ruleId": "CSCAN-GENERAL0020", + "createdDate": "2024-03-19 17:56:07Z", + "expirationDate": "2024-09-05 18:18:29Z", + "justification": "This error is baselined with an expiration date of 180 days from 2024-03-19 18:18:29Z" + } + } +} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index e44ab6f43..10bc2247d 100644 --- a/.vscode/launch.json +++ b/.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,8 +169,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/85d6dcb5b0164aa042c88d4668d94041/razorlanguageserver-linux-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/6a89b05d4c14a3542789c3ca650018b6/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b37a814188d56ac90f409a6e49098f4f/razorlanguageserver-linux-musl-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/04efb92c455ec620381317a43c480a1b/razorlanguageserver-linux-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/dfdfeadc3ed450706a0d00e057773fc6/razorlanguageserver-osx-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/2d73f9a16d450702b8ac8dbdde142799/razorlanguageserver-osx-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa73364791a8e908ff44a159d1f000d3/razorlanguageserver-platformagnostic-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa38f7d2ee74d0929e47c30d718ac096/razorlanguageserver-win-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fde24d8c856defdccbb652be05bc0fea/razorlanguageserver-win-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/ae634e36d0694be331db134d6c5494e8/razorlanguageserver-win-x86-7.0.0-preview.24161.6.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.24161.6", + "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", + "NEW_DEPS_VERSION": "7.0.0-preview.24168.4", "NEW_DEPS_ID": "Razor" }, "cwd": "${workspaceFolder}" @@ -185,8 +185,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/37c9cbad7a9df0efa17d40da3b8ff303/devkittelemetry-linux-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/782d968486f5324e3ff0c7d5fbc31191/devkittelemetry-linux-musl-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/7fc42bdb835a845efb4ee7cc5cf606d9/devkittelemetry-linux-musl-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b50efac289c46267b8e67318ab840ee4/devkittelemetry-linux-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9f4cdc6489f81ee9d94c218a61bc19a0/devkittelemetry-osx-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/473295a389ea3331c39b6bab7e52d990/devkittelemetry-osx-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9e99d301df6c535a4b5e031fbf3695d4/devkittelemetry-platformagnostic-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/36519b4fb02af42c26e5df12592999cc/devkittelemetry-win-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/c32a8e0f3ef1690f9b76dafabbfa8cae/devkittelemetry-win-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/5bf809c31472e7f6b734540f4f80c5f9/devkittelemetry-win-x86-7.0.0-preview.24161.6.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.24161.6", + "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" }, "cwd": "${workspaceFolder}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 38235c4dc..60d206971 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) ## Latest +* Rename RazorComponentAttribute semantic token to razorComponentAttribute (PR: [#6867](https://github.com/dotnet/vscode-csharp/pull/6867)) +* Drop win32-ia32 platform support (PR: [#6983](https://github.com/dotnet/vscode-csharp/pull/6983)) +* Fix some issues with casing when comparing Razor files (PR: [#6974](https://github.com/dotnet/vscode-csharp/pull/6974)) +* Do not timeout on connecting to the server if waitForDebugger is set (PR: [#6969](https://github.com/dotnet/vscode-csharp/pull/6969)) +* Bump Razor and update changelog (PR: [#6965](https://github.com/dotnet/vscode-csharp/pull/6965)) + * Fix an issue that could cause numerous semantic tokens LSP failures on new projects (PR: [#10050](https://github.com/dotnet/razor/pull/10050)) + * Fix an issue with running on .NET 9 preview builds (PR: [#10064](https://github.com/dotnet/razor/pull/10064)) +* Update Debugger Packages to v2.19.17 (PR: [#6958](https://github.com/dotnet/vscode-csharp/pull/6958)) + +## 2.23.2 - Updated debugger to fix .NET debugging break with searchNuGetOrgSymbolServer enabled (PR: [#6937](https://github.com/dotnet/vscode-csharp/pull/6937)) - Update Razor to add formatting option to force open brace onto the next line after a @code or @functions block (PR: [#10018](https://github.com/dotnet/razor/pull/10018)) @@ -18,8 +28,6 @@ - Don't ship as self-contained (PR: [#9891](https://github.com/dotnet/razor/pull/9891)) - Better using directive completiong (PR: [#9982](https://github.com/dotnet/razor/pull/9982)) - Add option to format code block open brace on new line (PR: [#10018](https://github.com/dotnet/razor/pull/10018) and [#6939](https://github.com/dotnet/vscode-csharp/pull/6939)) - - Fix an issue that could cause numerous semantic tokens LSP failures on new projects (PR: [#10050](https://github.com/dotnet/razor/pull/10050)) - - Fix an issue with running on .NET 9 preview builds (PR: [#10064](https://github.com/dotnet/razor/pull/10064)) ## 2.19.13 * Fix `Attribute` snippet (PR: [#6879](https://github.com/dotnet/vscode-csharp/pull/6879)) diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index e3a39e7c7..cd76ef3d0 100644 --- a/azure-pipelines-official.yml +++ b/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. \ No newline at end of file + 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 }} \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8bfc29546..299169b96 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,6 +15,8 @@ pr: stages: - template: azure-pipelines/build-all.yml + parameters: + isOfficial: false - stage: Test displayName: Test diff --git a/azure-pipelines/build-all.yml b/azure-pipelines/build-all.yml index 459c60c9b..1c608742a 100644 --- a/azure-pipelines/build-all.yml +++ b/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 diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index d99dbd29a..07f83288a 100644 --- a/azure-pipelines/build.yml +++ b/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' - \ No newline at end of file + displayName: 'Run artifacts tests' \ No newline at end of file diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml index f258b77e0..0b1455ec7 100644 --- a/azure-pipelines/release.yml +++ b/azure-pipelines/release.yml @@ -1,19 +1,10 @@ trigger: none pr: none -resources: - pipelines: - - pipeline: officialBuildCI - source: dotnet-vscode-csharp - branch: main - parameters: - name: test type: boolean default: true - - name: uploadPrerelease - type: boolean - default: true variables: # This is expected to provide VisualStudioMarketplacePAT to the release (https://code.visualstudio.com/api/working-with-extensions/publishing-extension#get-a-personal-access-token) @@ -21,111 +12,134 @@ variables: # This is expected to provide pat to tag release. - group: DncEng-Partners-Tokens -stages: -- stage: PublishStage - jobs: - - deployment: PublishToMarketplace - displayName: PublishToMarketplace - environment: vscode-csharp-release-approvals +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + pipelines: + - pipeline: officialBuildCI + source: dotnet-vscode-csharp + branch: main +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: pool: - vmImage: ubuntu-latest - strategy: - runOnce: - deploy: - steps: - - download: 'none' - - task: DownloadPipelineArtifact@2 - displayName: '📦 Download artifacts from build pipeline.' - inputs: - buildType: 'specific' - project: 'internal' - definition: 1264 - buildVersionToDownload: 'specific' - buildId: '$(resources.pipeline.officialBuildCI.runID)' - branchName: '$(resources.pipeline.officialBuildCI.sourceBranch)' - - pwsh: | - npm install --global vsce - displayName: 'Install vsce' - - pwsh: | - $artifactFolder = "VSIX_Release" - if ("${{ parameters.uploadPrerelease }}" -eq "true") { - $artifactFolder = "VSIX_Prerelease" - } - - Write-Host "Using artifacts from $artifactFolder" + name: netcore1espool-internal + image: 1es-windows-2022-pt + os: windows + customBuildTags: + - ES365AIMigrationTooling + stages: + - stage: PublishStage + jobs: + - deployment: PublishToMarketplace + displayName: PublishToMarketplace + environment: vscode-csharp-release-approvals + pool: + name: netcore1espool-internal + image: 1es-ubuntu-2204-pt + os: linux + strategy: + runOnce: + deploy: + steps: + - download: 'none' + - task: DownloadPipelineArtifact@2 + displayName: '📦 Download artifacts from build pipeline.' + inputs: + buildType: 'specific' + project: 'internal' + definition: 1264 + buildVersionToDownload: 'specific' + buildId: '$(resources.pipeline.officialBuildCI.runID)' + branchName: '$(resources.pipeline.officialBuildCI.sourceBranch)' + - pwsh: | + npm install --global vsce + displayName: 'Install vsce' + - pwsh: | + # Choose whether to upload to prerelease or release based on the artifacts generated by the build pipeline. + $artifactFolder = "" + $uploadPrerelease = $true + if (Test-Path -Path "VSIX_Prerelease") { + $artifactFolder = "VSIX_Prerelease" + $uploadPrerelease = $true + } elseif (Test-Path -Path "VSIX_Release") { + $artifactFolder = "VSIX_Release" + $uploadPrerelease = $false + } else { + throw "No artifacts are downloaded." + } - # Our build pipeline would generated build based on attempt number. Publishing the latest attempt. - $allArtifacts = Get-ChildItem -Path "$artifactFolder*" | Sort-Object -Descending - if ($allArtifacts.Length -eq 0) { - throw "No Artifacts is downloaded." - } + Write-Host "Uploading artifacts from $artifactFolder with prerelease=$uploadPrerelease" - $publishArtifacts = $allArtifacts[0] - Write-Host "All artifacts: $($allArtifacts). Publishing $($publishArtifacts)." + # Our build pipeline would generated build based on attempt number. Publishing the latest attempt. + $allArtifacts = Get-ChildItem -Path "$artifactFolder*" | Sort-Object -Descending + if ($allArtifacts.Length -eq 0) { + throw "No artifacts in $artifactFolder" + } - $basePublishArgs = , "publish" - If ("${{ parameters.uploadPrerelease }}" -eq "true") { - $basePublishArgs += "--pre-release" - Write-Host "Publish to pre-release channel." - } Else { - Write-Host "Publish to release channel." - } - $basePublishArgs += '--packagePath' + $publishArtifacts = $allArtifacts[0] + Write-Host "All artifacts: $($allArtifacts). Publishing $($publishArtifacts)." - # Publish win32-ia32 last as recommended at https://code.visualstudio.com/api/working-with-extensions/publishing-extension#platformspecific-extensions - # Since validation is done asynchronously, we further take care to push the win32 variants in the first batch *first*, - # to give them the longest lead time possible before the second batch with just the win32-ia32 vsix is published. - $nonIA32PlatformArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix -Include *x64*, *arm64* | Sort-Object Name -Descending |% { $_ }) - $ia32PlatformArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix -Include *ia32* | Sort-Object Name -Descending |% { $_ }) + $basePublishArgs = , "publish" + If ( $uploadPrerelease ) { + $basePublishArgs += "--pre-release" + Write-Host "Publish to pre-release channel." + } Else { + Write-Host "Publish to release channel." + } + $basePublishArgs += '--packagePath' + $publishArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix | Sort-Object Name -Descending |% { $_ }) - If ("${{ parameters.test }}" -eq "true") { - Write-Host "In test mode, command is printed instead of run." - Write-Host "##[command]vsce $nonIA32PlatformArgs" - Write-Host "##[command]vsce $ia32PlatformArgs" + If ("${{ parameters.test }}" -eq "true") { + Write-Host "In test mode, command is printed instead of run." + Write-Host "##[command]vsce $publishArgs" - Write-Host "🔒 Verify PAT." - vsce verify-pat ms-dotnettools - } - Else { - Write-Host "##[command]vsce $nonIA32PlatformArgs" - vsce @nonIA32PlatformArgs - Write-Host "##[command]vsce $ia32PlatformArgs" - vsce @ia32PlatformArgs - } - displayName: 🚀 Publish to Marketplace - workingDirectory: $(Pipeline.Workspace) - env: - VSCE_PAT: $(VSCodeMarketplacePAT) -- stage: 'TagRelease' - displayName: 'Tag release of vscode-csharp' - dependsOn: 'PublishStage' - condition: succeeded('PublishStage') - jobs: - - job: 'Tag' - pool: - vmImage: ubuntu-latest - steps: - - task: NodeTool@0 - displayName: 'Install Node.js 18.x' - inputs: - versionSpec: '18.x' - - checkout: self - clean: true - submodules: true - fetchTags: false - fetchDepth: 0 - - pwsh: | - git checkout $(resources.pipeline.officialBuildCI.sourceCommit) - displayName: 'Checkout build source branch' - - pwsh: | - npm ci - npm install - npm install -g gulp - gulp installDependencies - displayName: 'Install dependencies.' - - pwsh: | - # build number is generated by nerdbank git versioning and set to AzureDev - gulp createTags --releaseVersion $(resources.pipeline.officialBuildCI.runName) --releaseCommit $(resources.pipeline.officialBuildCI.sourceCommit) --dryRun ${{ parameters.test }} - env: - GitHubPAT: $(BotAccount-dotnet-bot-content-rw-grained-pat) - displayName: 'Create release tags' + Write-Host "🔒 Verify PAT." + vsce verify-pat ms-dotnettools + } + Else { + Write-Host "##[command]vsce $publishArgs" + vsce @publishArgs + } + displayName: 🚀 Publish to Marketplace + workingDirectory: $(Pipeline.Workspace) + env: + VSCE_PAT: $(VSCodeMarketplacePAT) + - stage: 'TagRelease' + displayName: 'Tag release of vscode-csharp' + dependsOn: 'PublishStage' + condition: succeeded('PublishStage') + jobs: + - job: 'Tag' + pool: + name: netcore1espool-internal + image: 1es-ubuntu-2204-pt + os: linux + steps: + - task: NodeTool@0 + displayName: 'Install Node.js 18.x' + inputs: + versionSpec: '18.x' + - checkout: self + clean: true + submodules: true + fetchTags: false + fetchDepth: 0 + - pwsh: | + git checkout $(resources.pipeline.officialBuildCI.sourceCommit) + displayName: 'Checkout build source branch' + - pwsh: | + npm ci + npm install + npm install -g gulp + gulp installDependencies + displayName: 'Install dependencies.' + - pwsh: | + # build number is generated by nerdbank git versioning and set to AzureDev + gulp createTags --releaseVersion $(resources.pipeline.officialBuildCI.runName) --releaseCommit $(resources.pipeline.officialBuildCI.sourceCommit) --dryRun ${{ parameters.test }} + env: + GitHubPAT: $(BotAccount-dotnet-bot-content-rw-grained-pat) + displayName: 'Create release tags' diff --git a/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts b/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts index 07a0ab96e..6cb120494 100644 --- a/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts +++ b/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts @@ -34,7 +34,7 @@ import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator'; const networkSettingsProvider = () => new NetworkSettings('', false); let eventStream: EventStream; const installPath = 'somePath'; - const platformInfo = new PlatformInformation('win32', 'x86'); + const platformInfo = new PlatformInformation('win32', 'x86_64'); let downloader: OmnisharpDownloader; let server: MockHttpsServer; let extensionPath: string; @@ -61,7 +61,7 @@ import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator'; await server.start(); server.addRequestHandler( 'GET', - `/releases/${version}/omnisharp-win-x86${suffix}.zip`, + `/releases/${version}/omnisharp-win-x64${suffix}.zip`, 200, { 'content-type': 'application/zip', @@ -93,19 +93,19 @@ import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator'; test('Events are created', async () => { const expectedSequence = [ new PackageInstallation('OmniSharp Version = 1.2.3'), - new LogPlatformInfo(new PlatformInformation('win32', 'x86')), + new LogPlatformInfo(new PlatformInformation('win32', 'x86_64')), new PackageInstallStart(), new DownloadStart( - `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x86), Version = 1.2.3` + `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x64), Version = 1.2.3` ), new DownloadSizeObtained(testZip.size), new DownloadProgress( 100, - `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x86), Version = 1.2.3` + `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x64), Version = 1.2.3` ), new DownloadSuccess(' Done!'), new InstallationStart( - `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x86), Version = 1.2.3` + `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x64), Version = 1.2.3` ), new InstallationSuccess(), ]; diff --git a/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts b/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts index df54ac707..93226e665 100644 --- a/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts +++ b/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts @@ -34,16 +34,6 @@ describe(OmnisharpManager.name, () => { let suffix: string; [ - { - platformInfo: new PlatformInformation('win32', 'x86'), - platformId: 'win-x86', - useFramework: false, - }, - { - platformInfo: new PlatformInformation('win32', 'x86'), - platformId: 'win-x86', - useFramework: true, - }, { platformInfo: new PlatformInformation('win32', 'x86_64'), platformId: 'win-x64', diff --git a/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts b/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts index df9c5e78e..acfd63bc5 100644 --- a/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts +++ b/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts @@ -72,22 +72,6 @@ describe('GetOmnisharpPackage : Output package depends on the input package and expect(resultPackage.installPath).toEqual(`experimentPath/1.2.3${pathSuffix}`); }); - test(`Install test path is calculated using specified path, version and ends with OmniSharp.exe or OmniSharp.dll - Windows(x86) ${ - useFramework ? 'on framework' : '' - }`, () => { - const testPackage = inputPackages.find((element) => element.platformId && element.platformId == 'win-x86'); - const resultPackage = SetBinaryAndGetPackage( - testPackage!, - useFramework, - serverUrl, - '1.2.3', - 'experimentPath' - ); - expect(resultPackage.installTestPath).toEqual( - `./experimentPath/1.2.3${pathSuffix}/OmniSharp.${useFramework ? 'exe' : 'dll'}` - ); - }); - test(`Install test path is calculated using specified path, version and ends with OmniSharp.exe or OmniSharp.dll - Windows(x64) ${ useFramework ? 'on framework' : '' }`, () => { diff --git a/omnisharptest/omnisharpUnitTests/testAssets/testAssets.ts b/omnisharptest/omnisharpUnitTests/testAssets/testAssets.ts index aaa96e20b..279c00a68 100644 --- a/omnisharptest/omnisharpUnitTests/testAssets/testAssets.ts +++ b/omnisharptest/omnisharpUnitTests/testAssets/testAssets.ts @@ -5,28 +5,6 @@ export const testPackageJSON = { runtimeDependencies: [ - { - description: 'OmniSharp for Windows (.NET 4.7.2 / x86)', - url: 'https://download.visualstudio.microsoft.com/download/pr/100505823/5804b7d3b5eeb7e4ae812a7cff03bd52/omnisharp-win-x86-1.28.0.zip', - fallbackUrl: 'https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.28.0.zip', - installPath: '.omnisharp', - platforms: ['win32'], - architectures: ['x86'], - installTestPath: './.omnisharp/OmniSharp.exe', - platformId: 'win-x86', - isFramework: true, - }, - { - description: 'OmniSharp for Windows (.NET 6 / x86)', - url: 'https://download.visualstudio.microsoft.com/download/pr/100505823/5804b7d3b5eeb7e4ae812a7cff03bd52/omnisharp-win-x86-1.28.0.zip', - fallbackUrl: 'https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.28.0.zip', - installPath: '.omnisharp', - platforms: ['win32'], - architectures: ['x86'], - installTestPath: './.omnisharp/OmniSharp.exe', - platformId: 'win-x86', - isFramework: false, - }, { description: 'OmniSharp for Windows (.NET 4.7.2 / x64)', url: 'https://download.visualstudio.microsoft.com/download/pr/100505821/c570a9e20dbf7172f79850babd058872/omnisharp-win-x64-1.28.0.zip', diff --git a/package-lock.json b/package-lock.json index 520ad3510..a448b254b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "csharp", - "version": "2.22.5", + "version": "2.23.15", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "csharp", - "version": "2.22.5", + "version": "2.23.15", "license": "SEE LICENSE IN RuntimeLicenses/license.txt", "dependencies": { "@microsoft/servicehub-framework": "4.2.99-beta", diff --git a/package.json b/package.json index 0d3bb78b8..3edbd9660 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "csharp", "publisher": "muhammad-sammy", - "version": "2.22.5", + "version": "2.23.15", "description": "Free/Libre C# support for vscode-compatible editors.", "displayName": "C#", "author": "Muhammad Sammy", @@ -37,11 +37,11 @@ } }, "defaults": { - "roslyn": "4.10.0-2.24124.2", + "roslyn": "4.10.0-3.24168.7", "omniSharp": "1.39.11", - "razor": "7.0.0-preview.24161.6", + "razor": "7.0.0-preview.24168.4", "razorOmnisharp": "7.0.0-preview.23363.1", - "razorTelemetry": "7.0.0-preview.24161.6" + "razorTelemetry": "7.0.0-preview.24168.4" }, "main": "./dist/extension", "l10n": "./l10n", @@ -177,38 +177,6 @@ "webpack-cli": "4.6.0" }, "runtimeDependencies": [ - { - "id": "OmniSharp", - "description": "OmniSharp for Windows (.NET 4.7.2 / x86)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", - "platforms": [ - "win32" - ], - "architectures": [ - "x86" - ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.exe", - "platformId": "win-x86", - "isFramework": true, - "integrity": "DF52F6BCEEF14033E8A8C374EF1B81D223FFD17BA9D7E297CFCF0C4BEBF0A22F" - }, - { - "id": "OmniSharp", - "description": "OmniSharp for Windows (.NET 6 / x86)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11-net6.0", - "platforms": [ - "win32" - ], - "architectures": [ - "x86" - ], - "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", - "platformId": "win-x86", - "isFramework": false, - "integrity": "BAF991481E56A75E2D865648A212310BB8EB9ACA44BABE64AA284C8E044DC844" - }, { "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 4.7.2 / x64)", @@ -517,7 +485,7 @@ { "id": "Razor", "description": "Razor Language Server (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fde24d8c856defdccbb652be05bc0fea/razorlanguageserver-win-x64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/dc3bfe5f9473a09cb823d665193d4ff0/razorlanguageserver-win-x64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "win32" @@ -525,25 +493,12 @@ "architectures": [ "x86_64" ], - "integrity": "102C4A85794380CA6102E1519B81A45528EFC845F007B0A1BF57D18B1044618F" - }, - { - "id": "Razor", - "description": "Razor Language Server (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/ae634e36d0694be331db134d6c5494e8/razorlanguageserver-win-x86-7.0.0-preview.24161.6.zip", - "installPath": ".razor", - "platforms": [ - "win32" - ], - "architectures": [ - "x86" - ], - "integrity": "5B926A914DA51D0CEB3924EF9D2CC5FD5D55C9CDB0812C01A3C0FA8C7961DE14" + "integrity": "0F2BFD0048540086D608BB958F40E244536A33786FB7F76EE1A9FF7D34C1B124" }, { "id": "Razor", "description": "Razor Language Server (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa38f7d2ee74d0929e47c30d718ac096/razorlanguageserver-win-arm64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bbc8d2a30ba7da4e0eb4465a329b1fa1/razorlanguageserver-win-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "win32" @@ -551,12 +506,12 @@ "architectures": [ "arm64" ], - "integrity": "39F34ACE165B4FCAF26C1A6078A6291D096070DCBFEAA543E36D98BB6F64180F" + "integrity": "7FB8617456C0C9CB12BEC5A18189B91709925E3AC74CCC95E4DF11E24C87A270" }, { "id": "Razor", "description": "Razor Language Server (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/04efb92c455ec620381317a43c480a1b/razorlanguageserver-linux-x64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/fdf85820363515f55ce0f4e35a7fe780/razorlanguageserver-linux-x64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "linux" @@ -567,12 +522,12 @@ "binaries": [ "./rzls" ], - "integrity": "92797C5A70763AE69A34D66860AFFF0A8D2E40E43D297EA0A9255CCD6D7A1EC0" + "integrity": "92993C6D3F74D5176826714AE6C1619B6538FD8085913F41BEFB7F8202CED137" }, { "id": "Razor", "description": "Razor Language Server (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/85d6dcb5b0164aa042c88d4668d94041/razorlanguageserver-linux-arm64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "linux" @@ -583,12 +538,12 @@ "binaries": [ "./rzls" ], - "integrity": "C52F23F456B6D28A154F7DACF36F68B2DE18C3E4FE444AF8EF76591D07248312" + "integrity": "5BCBBF401B31274193900AAE1285E90FDF58B5225841BE66099B57D4E978E295" }, { "id": "Razor", "description": "Razor Language Server (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b37a814188d56ac90f409a6e49098f4f/razorlanguageserver-linux-musl-x64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/97b57265a3097b6128aaa4be297f1243/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -599,12 +554,12 @@ "binaries": [ "./rzls" ], - "integrity": "AA12F5F3EA6C8159E4F4BE3B2C9D70DF87D0E849547F2484501EB78E7C9716EF" + "integrity": "388B127FBA5025D52806EB0900D5E13C065203FEA4DF6C6CA1BA8EEE320D5D31" }, { "id": "Razor", "description": "Razor Language Server (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/6a89b05d4c14a3542789c3ca650018b6/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b6fa76f8ccfa8053f56f1fa3d39e78c9/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -615,12 +570,12 @@ "binaries": [ "./rzls" ], - "integrity": "6EAC43F45A06D894A99B9B40E75D97FAB6986D2EE7A123A0B9FE54E30CDA53D9" + "integrity": "CF03AE8CFE86FB7DDC169ACA9F078A03FA32C1AB8535B92BAC83D5F47291249D" }, { "id": "Razor", "description": "Razor Language Server (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/2d73f9a16d450702b8ac8dbdde142799/razorlanguageserver-osx-x64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/581c065f415941a97c7687403da5d61c/razorlanguageserver-osx-x64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -631,12 +586,12 @@ "binaries": [ "./rzls" ], - "integrity": "9379E0DFB02C99C67024798D7430FEC193632DDA731E425AC184724326778A11" + "integrity": "7CA7693BDB386C98BD26E7BA5724D2848F564F1463324BDAC9AE61C22B5CE6C9" }, { "id": "Razor", "description": "Razor Language Server (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/dfdfeadc3ed450706a0d00e057773fc6/razorlanguageserver-osx-arm64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/48d3bef6b7f06634e53ca433be40e52a/razorlanguageserver-osx-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -647,12 +602,12 @@ "binaries": [ "./rzls" ], - "integrity": "A1DBCD2E53743A9912FCC1C6C00D251D107413F02256575945CAB54C4257867F" + "integrity": "AF561492013B04AEA29FDF93F1233922B8281905A0ECA09DA99657BF059682AA" }, { "id": "Razor", "description": "Razor Language Server (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa73364791a8e908ff44a159d1f000d3/razorlanguageserver-platformagnostic-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b2940e8871ef222b0bc820b51ec44ed2/razorlanguageserver-platformagnostic-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "neutral" @@ -663,7 +618,7 @@ "binaries": [ "./rzls" ], - "integrity": "41EB32001E14B4373A3307E39752AE72D92172B875EF9E4342F97371867E9627" + "integrity": "F20BBB9A2CBA42938DB63BB4D8C0557029C29D92E2BF2B4390F4B69A116E9F17" }, { "id": "RazorOmnisharp", @@ -677,18 +632,6 @@ "x86_64" ] }, - { - "id": "RazorOmnisharp", - "description": "Razor Language Server for OmniSharp (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/aee63398-023f-48db-bba2-30162c68f0c4/e440c4f3a4a96334fe177513935fa010/razorlanguageserver-win-x86-7.0.0-preview.23363.1.zip", - "installPath": ".razoromnisharp", - "platforms": [ - "win32" - ], - "architectures": [ - "x86" - ] - }, { "id": "RazorOmnisharp", "description": "Razor Language Server for OmniSharp (Windows / ARM64)", @@ -4703,7 +4646,7 @@ "description": "A Razor component element" }, { - "id": "RazorComponentAttribute", + "id": "razorComponentAttribute", "description": "A Razor component attribute" }, { @@ -5017,7 +4960,7 @@ "razorComponentElement": [ "entity.name.class.element.component" ], - "RazorComponentAttribute": [ + "razorComponentAttribute": [ "entity.name.class.attribute.component" ], "razorTagHelperElement": [ diff --git a/src/main.ts b/src/main.ts index c956c7970..9868b2f1d 100644 --- a/src/main.ts +++ b/src/main.ts @@ -430,9 +430,7 @@ function profferBrokeredServices( function isSupportedPlatform(platform: PlatformInformation): boolean { if (platform.isWindows()) { - return ( - platform.architecture === 'x86' || platform.architecture === 'x86_64' || platform.architecture === 'arm64' - ); + return platform.architecture === 'x86_64' || platform.architecture === 'arm64'; } if (platform.isMacOS()) { diff --git a/tasks/offlinePackagingTasks.ts b/tasks/offlinePackagingTasks.ts index 1fb6f7d5f..ea62e5831 100644 --- a/tasks/offlinePackagingTasks.ts +++ b/tasks/offlinePackagingTasks.ts @@ -43,7 +43,6 @@ interface VSIXPlatformInfo { // Mapping of vsce vsix packaging target to the RID used to build the server executable export const platformSpecificPackages: VSIXPlatformInfo[] = [ { vsceTarget: 'win32-x64', rid: 'win-x64', platformInfo: new PlatformInformation('win32', 'x86_64') }, - { vsceTarget: 'win32-ia32', rid: 'win-x86', platformInfo: new PlatformInformation('win32', 'x86') }, { vsceTarget: 'win32-arm64', rid: 'win-arm64', platformInfo: new PlatformInformation('win32', 'arm64') }, { vsceTarget: 'linux-x64', rid: 'linux-x64', platformInfo: new PlatformInformation('linux', 'x86_64') }, { vsceTarget: 'linux-arm64', rid: 'linux-arm64', platformInfo: new PlatformInformation('linux', 'arm64') },