Skip to content

Commit b8896aa

Browse files
muhammadsammymuhammadsammy
committed
Upgrade to 'v2.22.5'
2 parents b921e03 + 8ed9f00 commit b8896aa

File tree

12 files changed

+158
-132
lines changed

12 files changed

+158
-132
lines changed

‎.vscode/launch.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@
169169
"updatePackageDependencies"
170170
],
171171
"env": {
172-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/df5123052f373f09ea917bfe3eed062a/razorlanguageserver-linux-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/d824625f4579e30e8db44d60321063ec/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/eec1d3a9302ee33a4cb0e204174d649f/razorlanguageserver-linux-musl-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/7bc6da40ca09c2afb6e83631297e2d33/razorlanguageserver-linux-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/f59f943afd1164f1241c052f51dcfac5/razorlanguageserver-osx-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/18f1f526b2f4d34c0972022aa300a577/razorlanguageserver-osx-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/d3836b547c605fbe7b2d414e990285b8/razorlanguageserver-platformagnostic-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/b07322d606733c7ec0ca7211d7761a08/razorlanguageserver-win-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/6fef4d9f617dd94342383f96cc28e6dd/razorlanguageserver-win-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/5557c0738b48d4fbc040317033b82346/razorlanguageserver-win-x86-7.0.0-preview.24151.1.zip",
173-
"NEW_DEPS_VERSION": "7.0.0-preview.24151.1",
172+
"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",
173+
"NEW_DEPS_VERSION": "7.0.0-preview.24161.6",
174174
"NEW_DEPS_ID": "Razor"
175175
},
176176
"cwd": "${workspaceFolder}"
@@ -185,8 +185,8 @@
185185
"updatePackageDependencies"
186186
],
187187
"env": {
188-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/335a13de31886ca24ea4b5e4c3747a3e/devkittelemetry-linux-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/fe4c910f2ee9de76b73346d4cbfca01f/devkittelemetry-linux-musl-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/cd6e7fbec886daa7cba58220498652ef/devkittelemetry-linux-musl-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/6f6b95c75f659e53fc771653f10a34fe/devkittelemetry-linux-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/82723fee5a3b1cdff8e07f9d968abb82/devkittelemetry-osx-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/186727cce33fcb6dad9b4872a3b49f2b/devkittelemetry-osx-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/de0ddda3b603f8c1c2d97358b91f3efc/devkittelemetry-platformagnostic-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/3441e44f0e7558691fbad5cf89b4b34f/devkittelemetry-win-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/baa44b197ca0b0d372fe93de5cd90248/devkittelemetry-win-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/852d5c6eaa576d5c65a25af8b8a1cea6/devkittelemetry-win-x86-7.0.0-preview.24151.1.zip",
189-
"NEW_DEPS_VERSION": "7.0.0-preview.24151.1",
188+
"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",
189+
"NEW_DEPS_VERSION": "7.0.0-preview.24161.6",
190190
"NEW_DEPS_ID": "RazorTelemetry"
191191
},
192192
"cwd": "${workspaceFolder}"

‎CHANGELOG.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,22 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
## Latest
7+
- Updated debugger to fix .NET debugging break with searchNuGetOrgSymbolServer enabled (PR: [#6937](https://github.com/dotnet/vscode-csharp/pull/6937))
8+
- 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))
9+
10+
## 2.22.2
711
- Update Roslyn to run on .NET 8 (PR: [#6920](https://github.com/dotnet/vscode-csharp/pull/6920))
812
* Upgrade language server to run on .NET 8 (PR: [#72247](https://github.com/dotnet/roslyn/pull/72247))
913
* Refactors LSP server extension assembly loading (PR: [#71862](https://github.com/dotnet/roslyn/pull/71862))
1014
* Report better warnings and errors if build hosts exit abnormally (PR: [#71909](https://github.com/dotnet/roslyn/pull/71909))
11-
* Update Razor to 7.0.0-preview.24151.1 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922))
15+
- Update Razor to 7.0.0-preview.24161.6 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922))
1216
- Upgrade language server to run on .NET 8 (PR: [#9981](https://github.com/dotnet/razor/pull/9981))
1317
- Support inlay hints (PR: [#9904](https://github.com/dotnet/razor/pull/9904) and [#6857](https://github.com/dotnet/vscode-csharp/pull/6857))
1418
- Don't ship as self-contained (PR: [#9891](https://github.com/dotnet/razor/pull/9891))
1519
- Better using directive completiong (PR: [#9982](https://github.com/dotnet/razor/pull/9982))
20+
- 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))
21+
- Fix an issue that could cause numerous semantic tokens LSP failures on new projects (PR: [#10050](https://github.com/dotnet/razor/pull/10050))
22+
- Fix an issue with running on .NET 9 preview builds (PR: [#10064](https://github.com/dotnet/razor/pull/10064))
1623

1724
## 2.19.13
1825
* Fix `Attribute` snippet (PR: [#6879](https://github.com/dotnet/vscode-csharp/pull/6879))

‎azure-pipelines/loc.yml‎

Lines changed: 68 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -20,67 +20,76 @@ parameters:
2020
type: boolean
2121
default: true
2222

23+
resources:
24+
repositories:
25+
- repository: 1ESPipelineTemplates
26+
type: git
27+
name: 1ESPipelineTemplates/1ESPipelineTemplates
28+
ref: refs/tags/release
29+
2330
variables:
2431
# Variable group contains the PAT to LOC
2532
- group: OneLocBuildVariables
2633

27-
stages:
28-
- stage: LocalizationStage
29-
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
30-
jobs:
31-
- job: Localization
34+
extends:
35+
template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
36+
parameters:
3237
pool:
33-
name: NetCore1ESPool-Internal
34-
demands: ImageOverride -equals windows.vs2022preview.amd64
35-
steps:
36-
- task: NodeTool@0
37-
displayName: 'Install Node.js 18.x'
38-
inputs:
39-
# Octokit client needs 18.x to have 'fetch' function.
40-
versionSpec: '18.x'
41-
- checkout: self
42-
clean: true
43-
submodules: true
44-
fetchTags: false
45-
fetchDepth: 0
46-
- pwsh: |
47-
npm install
48-
npm install -g gulp
49-
displayName: 'Install tools'
50-
- pwsh: npm run compile
51-
displayName: 'Compile'
52-
- pwsh: npm run l10nDevGenerateLocalizationBundle
53-
displayName: 'Generate bundle.l10.json'
54-
- pwsh: npm run l10nDevGenerateXlf
55-
displayName: 'Generate xlf files from bundle.10n.json'
56-
- task: OneLocBuild@2
57-
env:
58-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
59-
inputs:
60-
locProj: loc/LocProject.json
61-
outDir: '$(Build.SourcesDirectory)/loc'
62-
isCreatePrSelected: false
63-
patVariable: $(dn-bot-ceapex-package-r)
64-
packageSourceAuth: patAuth
65-
lclSource: lclFilesfromPackage
66-
LclPackageId: 'LCL-JUNO-PROD-VSCODECS'
67-
- pwsh: npm run l10nDevImportXlf
68-
displayName: 'Import xlf to json.'
69-
- pwsh: gulp 'publish localization content' --userName dotnet-bot --email [email protected] --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main'
70-
displayName: 'Create PR in GitHub.'
71-
env:
72-
GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT)
73-
- task: PublishBuildArtifacts@1
74-
displayName: 'Publish Localization Files'
75-
inputs:
76-
PathtoPublish: '$(Build.SourcesDirectory)/loc'
77-
PublishLocation: Container
78-
ArtifactName: Loc
79-
condition: ${{ parameters.publishLocalizationFile }}
80-
- task: PublishBuildArtifacts@1
81-
displayName: 'Publish l10n file'
82-
inputs:
83-
PathtoPublish: '$(Build.SourcesDirectory)/l10n'
84-
PublishLocation: Container
85-
ArtifactName: l10n
86-
condition: ${{ parameters.publishLocalizationFile }}
38+
name: NetCore1ESPool-Svc-Internal
39+
image: 1es-windows-2022-pt
40+
os: windows
41+
stages:
42+
- stage: LocalizationStage
43+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
44+
jobs:
45+
- job: Localization
46+
templateContext:
47+
outputs:
48+
- output: pipelineArtifact
49+
displayName: LOC
50+
targetPath: '$(Build.SourcesDirectory)/loc'
51+
condition: ${{ parameters.publishLocalizationFile }}
52+
artifactName: loc
53+
- output: pipelineArtifact
54+
displayName: l10n
55+
targetPath: '$(Build.SourcesDirectory)/l10n'
56+
condition: ${{ parameters.publishLocalizationFile }}
57+
artifactName: l10n
58+
steps:
59+
- task: NodeTool@0
60+
displayName: 'Install Node.js 18.x'
61+
inputs:
62+
# Octokit client needs 18.x to have 'fetch' function.
63+
versionSpec: '18.x'
64+
- checkout: self
65+
clean: true
66+
submodules: true
67+
fetchTags: false
68+
fetchDepth: 0
69+
- pwsh: |
70+
npm install
71+
npm install -g gulp
72+
displayName: 'Install tools'
73+
- pwsh: npm run compile
74+
displayName: 'Compile'
75+
- pwsh: npm run l10nDevGenerateLocalizationBundle
76+
displayName: 'Generate bundle.l10.json'
77+
- pwsh: npm run l10nDevGenerateXlf
78+
displayName: 'Generate xlf files from bundle.10n.json'
79+
- task: OneLocBuild@2
80+
env:
81+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
82+
inputs:
83+
locProj: loc/LocProject.json
84+
outDir: '$(Build.SourcesDirectory)/loc'
85+
isCreatePrSelected: false
86+
patVariable: $(dn-bot-ceapex-package-r)
87+
packageSourceAuth: patAuth
88+
lclSource: lclFilesfromPackage
89+
LclPackageId: 'LCL-JUNO-PROD-VSCODECS'
90+
- pwsh: npm run l10nDevImportXlf
91+
displayName: 'Import xlf to json.'
92+
- pwsh: gulp 'publish localization content' --userName dotnet-bot --email [email protected] --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main'
93+
displayName: 'Create PR in GitHub.'
94+
env:
95+
GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT)

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)