Skip to content

Commit 71bdaba

Browse files
authored
[automated] Merge branch 'main' => 'prerelease' (#8344)
2 parents 3d5869b + 54d6cad commit 71bdaba

File tree

7 files changed

+41
-25
lines changed

7 files changed

+41
-25
lines changed

CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@
33
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

6+
# 2.81.x
7+
* Bump Razor to 10.0.0-preview.25279.1 (PR: [#8336](https://github.com/dotnet/vscode-csharp/pull/8336))
8+
* Don't produce RazorSourceDocuments for imports with incorrect file paths (#11897) (PR: [#11897](https://github.com/dotnet/razor/pull/11897))
9+
* Fixes one of the cases in directive attribute completion (#11896) (PR: [#11896](https://github.com/dotnet/razor/pull/11896))
10+
* Reduce costs in ComponentDirectiveVisitor.VisitRazorDirective (#11881) (PR: [#11881](https://github.com/dotnet/razor/pull/11881))
11+
* Compiler: Rationalize nodes, tokens, visitors, walkers, and rewriters, oh my! (#11853) (PR: [#11853](https://github.com/dotnet/razor/pull/11853))
12+
* Reduce allocations in TagHelperParseTreeRewriter.Rewrite (#11882) (PR: [#11882](https://github.com/dotnet/razor/pull/11882))
13+
* Propagate DynamicallyAccessedMembersAttribute to type inference method (#11856) (PR: [#11856](https://github.com/dotnet/razor/pull/11856))
14+
* Tooling: Don't throw exceptions when generating code for file rooted outside of project (#11864) (PR: [#11864](https://github.com/dotnet/razor/pull/11864))
15+
* Ensure @model types have a mapping in razor pages (#11844) (PR: [#11844](https://github.com/dotnet/razor/pull/11844))
16+
* Fix aligned buffer write (#11861) (PR: [#11861](https://github.com/dotnet/razor/pull/11861))
17+
* Update Debugger Packages to v2.81.0(PR: [#8329](https://github.com/dotnet/vscode-csharp/pull/8329))
18+
* Localization changes (PR: [#8327](https://github.com/dotnet/vscode-csharp/pull/8327))
19+
620
# 2.80.x
721
* Fix license link in marketplace (PR: [#8318](https://github.com/dotnet/vscode-csharp/pull/8318))
822
* Localization (PR: [#8309](https://github.com/dotnet/vscode-csharp/pull/8309))
@@ -25,7 +39,7 @@
2539
* Shorten log category name(PR: [#78526](https://github.com/dotnet/roslyn/pull/78526))
2640
* Reduce allocations during SourceGeneration(PR: [#78403](https://github.com/dotnet/roslyn/pull/78403))
2741
* Fix razor redirect(PR: [#78448](https://github.com/dotnet/roslyn/pull/78448))
28-
* Bump Razor to 10.0.0-preview.25262.1(PR: [#8283](https://github.com/dotnet/vscode-csharp/pull/8283))
42+
* Bump Razor to 10.0.0-preview.25262.1 (PR: [#8283](https://github.com/dotnet/vscode-csharp/pull/8283))
2943
* Compiler: Replace SyntaxListBuilder with PooledArrayBuilder<T> and miscellaneous performance tweaks (PR: [#11841](https://github.com/dotnet/razor/pull/11841))
3044
* Allow html requests to be properly cancelled (PR: [#11829](https://github.com/dotnet/razor/pull/11829))
3145
* Fuse/typeparamintellisense (PR: [#11795](https://github.com/dotnet/razor/pull/11795))

CONTRIBUTING.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,15 @@ To update the version of the roslyn server used by the extension do the followin
172172
## Snapping for releases
173173
Extension releases on the marketplace are done from the prerelease and release branches (corresponding to the prerelease or release version of the extension). Code flows from main -> prerelease -> release. Every week we snap main -> prerelease. Monthly, we snap prerelease -> release.
174174

175+
### Snap main -> prerelease
175176
The snap is done via the "Branch snap" github action. To run the snap from main -> prerelease, run the action via "Run workflow" and choose main as the base branch.
176177
![branch snap action](./docs/main_snap.png)
177178

178179
This will generate two PRs that must be merged. One merging the main branch into prerelease, and the other bumps the version in main.
179180
![generated prs](./docs/generated_prs.png)
180181

181-
To snap from prerelease to main, run the same action but use **prerelease** as the workflow branch. This will generate a single PR merging from prerelease to release.
182+
### Snap prerelease -> release
183+
To snap from prerelease to release, run the same action but use **prerelease** as the workflow branch. This will generate a single PR merging from prerelease to release.
182184

183185
### Marketplace release
184186
The marketplace release is managed by an internal AzDo pipeline. On the pipeline page, hit run pipeline. This will bring up the pipeline parameters to fill out:

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"defaults": {
4343
"roslyn": "5.0.0-1.25266.2",
4444
"omniSharp": "1.39.12",
45-
"razor": "10.0.0-preview.25262.1",
45+
"razor": "10.0.0-preview.25279.1",
4646
"razorOmnisharp": "7.0.0-preview.23363.1",
4747
"xamlTools": "17.14.36106.43"
4848
},
@@ -425,7 +425,7 @@
425425
{
426426
"id": "Debugger",
427427
"description": ".NET Core Debugger (Windows / x64)",
428-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-win7-x64.zip",
428+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-win7-x64.zip",
429429
"installPath": ".debugger/x86_64",
430430
"platforms": [
431431
"win32"
@@ -435,12 +435,12 @@
435435
"arm64"
436436
],
437437
"installTestPath": "./.debugger/x86_64/vsdbg-ui.exe",
438-
"integrity": "3696E84C5CB4D22DDD6B4EDFA28DAE7B41783665F49F3863CA32629E4DBB8D91"
438+
"integrity": "5C7C000F23267EB15FE6D517156417508C772AD6CEB4D7D8AFAE4CD81B826452"
439439
},
440440
{
441441
"id": "Debugger",
442442
"description": ".NET Core Debugger (Windows / ARM64)",
443-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-win10-arm64.zip",
443+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-win10-arm64.zip",
444444
"installPath": ".debugger/arm64",
445445
"platforms": [
446446
"win32"
@@ -449,12 +449,12 @@
449449
"arm64"
450450
],
451451
"installTestPath": "./.debugger/arm64/vsdbg-ui.exe",
452-
"integrity": "A5460716A03352DE2EE87D212F0E69CB95037BA825258BBF0EBDCEC26365406E"
452+
"integrity": "86E2B48A5F405CFF4A99A3C4236DE7355DFF8F9EFEBE1A204B21B80CD140F394"
453453
},
454454
{
455455
"id": "Debugger",
456456
"description": ".NET Core Debugger (macOS / x64)",
457-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-osx-x64.zip",
457+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-osx-x64.zip",
458458
"installPath": ".debugger/x86_64",
459459
"platforms": [
460460
"darwin"
@@ -468,12 +468,12 @@
468468
"./vsdbg"
469469
],
470470
"installTestPath": "./.debugger/x86_64/vsdbg-ui",
471-
"integrity": "85DD2B0405AA6E5AEACF3B782A9D843550F4CD542C79556992B55D9A782D0EA0"
471+
"integrity": "16BAC2DEBD47C23B3682801E263395492BEE73BF2DD326BF132A397B7A08984E"
472472
},
473473
{
474474
"id": "Debugger",
475475
"description": ".NET Core Debugger (macOS / arm64)",
476-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-osx-arm64.zip",
476+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-osx-arm64.zip",
477477
"installPath": ".debugger/arm64",
478478
"platforms": [
479479
"darwin"
@@ -486,12 +486,12 @@
486486
"./vsdbg"
487487
],
488488
"installTestPath": "./.debugger/arm64/vsdbg-ui",
489-
"integrity": "FBE989F678A7CA4E0E64ABF5C48D53DF16998B6553566436EBA44FEB06126BCA"
489+
"integrity": "C335E8E06F8391B2CF2F85352D62ED736FD3CEF1A37BEEE9E47700EC8CD454DC"
490490
},
491491
{
492492
"id": "Debugger",
493493
"description": ".NET Core Debugger (linux / ARM)",
494-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-linux-arm.zip",
494+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-linux-arm.zip",
495495
"installPath": ".debugger",
496496
"platforms": [
497497
"linux"
@@ -504,12 +504,12 @@
504504
"./vsdbg"
505505
],
506506
"installTestPath": "./.debugger/vsdbg-ui",
507-
"integrity": "C7E56E994E8386D26B8A921DF3C28F25D862C1163FEC4006F935A76855DF7FC4"
507+
"integrity": "552FD02F8C89616498CF95FE1F9229C69E1AE2A594E63CA6989405397CE37BE6"
508508
},
509509
{
510510
"id": "Debugger",
511511
"description": ".NET Core Debugger (linux / ARM64)",
512-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-linux-arm64.zip",
512+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-linux-arm64.zip",
513513
"installPath": ".debugger",
514514
"platforms": [
515515
"linux"
@@ -522,12 +522,12 @@
522522
"./vsdbg"
523523
],
524524
"installTestPath": "./.debugger/vsdbg-ui",
525-
"integrity": "5F84A51AA7CF4477CCB6294DCB98A298466F56D98A61B4A4BDE30A6CC42058E4"
525+
"integrity": "EF74A61BA674B926F4570EE0FF8A2FDEE5ABC5BF1400980B1D750CF459D0576F"
526526
},
527527
{
528528
"id": "Debugger",
529529
"description": ".NET Core Debugger (linux musl / x64)",
530-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-linux-musl-x64.zip",
530+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-linux-musl-x64.zip",
531531
"installPath": ".debugger",
532532
"platforms": [
533533
"linux-musl"
@@ -540,12 +540,12 @@
540540
"./vsdbg"
541541
],
542542
"installTestPath": "./.debugger/vsdbg-ui",
543-
"integrity": "727B0E11D11F3666C0B713B9F1775842978552A1ED2DB4EBEDA01DF6DDA1A5B6"
543+
"integrity": "3A68871DA6C875FF1DE326D29C8A1068C0CBF81DC8455854C6D1F8A84D6327CD"
544544
},
545545
{
546546
"id": "Debugger",
547547
"description": ".NET Core Debugger (linux musl / ARM64)",
548-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-linux-musl-arm64.zip",
548+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-linux-musl-arm64.zip",
549549
"installPath": ".debugger",
550550
"platforms": [
551551
"linux-musl"
@@ -558,12 +558,12 @@
558558
"./vsdbg"
559559
],
560560
"installTestPath": "./.debugger/vsdbg-ui",
561-
"integrity": "E99EA50B83F6C998B6A95A2E73EC8CFD4BCDDE50FAF741A9B704444038D69BF3"
561+
"integrity": "5551419BE51F923CC2B3A566760ED88368F191C75162CBAAB55B66BE6B67ECAE"
562562
},
563563
{
564564
"id": "Debugger",
565565
"description": ".NET Core Debugger (linux / x64)",
566-
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-linux-x64.zip",
566+
"url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-linux-x64.zip",
567567
"installPath": ".debugger",
568568
"platforms": [
569569
"linux"
@@ -576,7 +576,7 @@
576576
"./vsdbg"
577577
],
578578
"installTestPath": "./.debugger/vsdbg-ui",
579-
"integrity": "6C19A387671FF9114F375025556C6D331476D85C06274CB7C015B2135A7E7F99"
579+
"integrity": "4BC2101C38261EDAB3BBAE6DA2CC2D5B08D4FD85E19A2A8C9764778E54AC4A66"
580580
},
581581
{
582582
"id": "RazorOmnisharp",

package.nls.ko.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"configuration.dotnet.preferCSharpExtension": "프로젝트가 C# 확장으로만 로드되도록 합니다. C# 개발 키트에서 지원되지 않는 레거시 프로젝트 형식을 사용할 때 유용할 수 있습니다(창 다시 로드 필요).",
6262
"configuration.dotnet.projects.binaryLogPath": "로드 오류를 진단하는 데 도움이 되도록 프로젝트를 로드할 때 MSBuild 이진 로그가 기록되는 경로를 설정합니다.",
6363
"configuration.dotnet.projects.enableAutomaticRestore": "확장에서 자산이 누락된 것을 감지하는 경우 자동 NuGet 복원을 사용하도록 설정합니다.",
64-
"configuration.dotnet.projects.enableFileBasedPrograms": "Enables the preview \"file-based programs\" (dotnet run app.cs) experience.",
64+
"configuration.dotnet.projects.enableFileBasedPrograms": "미리 보기 \"파일 기반 프로그램\"(dotnet run app.cs) 환경을 활성화합니다.",
6565
"configuration.dotnet.quickInfo.showRemarksInQuickInfo": "기호를 표시할 때 설명 정보를 표시합니다.",
6666
"configuration.dotnet.server.componentPaths": "언어 서버의 기본 제공 구성 요소에 대한 폴더 경로를 재정의할 수 있습니다(예: 로컬로 빌드된 구성 요소를 사용하도록 확장 디렉터리의 .roslynDevKit 경로 재정의).",
6767
"configuration.dotnet.server.componentPaths.roslynDevKit": "언어 서버의 .roslynDevKit 구성 요소에 대한 폴더 경로를 재정의합니다.",

package.nls.pl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"configuration.dotnet.preferCSharpExtension": "Wymusza ładowanie projektów tylko z rozszerzeniem języka C#. Może to być przydatne w przypadku korzystania ze starszych typów projektów, które nie są obsługiwane przez zestaw C# Dev Kit. (Wymaga ponownego załadowania okna)",
6262
"configuration.dotnet.projects.binaryLogPath": "Ustawia ścieżkę, w której dzienniki binarne programu MSBuild są zapisywane podczas ładowania projektów, aby ułatwić diagnozowanie błędów ładowania.",
6363
"configuration.dotnet.projects.enableAutomaticRestore": "Włącza automatyczne przywracanie pakietu NuGet, jeśli rozszerzenie wykryje brak zasobów.",
64-
"configuration.dotnet.projects.enableFileBasedPrograms": "Enables the preview \"file-based programs\" (dotnet run app.cs) experience.",
64+
"configuration.dotnet.projects.enableFileBasedPrograms": "Włącza podgląd środowiska „programy oparte na plikach” (dotnet run app.cs).",
6565
"configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Pokaż informacje o uwagach podczas wyświetlania symbolu.",
6666
"configuration.dotnet.server.componentPaths": "Umożliwia zastąpienie ścieżki folderu dla wbudowanych składników serwera języka (na przykład przesłonięcie ścieżki roslynDevKit w katalogu rozszerzenia w celu użycia składników skompilowanych lokalnie)",
6767
"configuration.dotnet.server.componentPaths.roslynDevKit": "Przesłania ścieżkę folderu dla składnika roslynDevKit serwera językowego",

package.nls.zh-cn.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"configuration.dotnet.preferCSharpExtension": "仅强制使用 C# 扩展加载项目。使用 C# Dev Kit 不支持的旧项目类型时,这可能很有用。(需要重新加载窗口)",
6262
"configuration.dotnet.projects.binaryLogPath": "设置在加载项目时写入 MSBuild 二进制日志的路径,以帮助诊断加载错误。",
6363
"configuration.dotnet.projects.enableAutomaticRestore": "如果扩展检测到缺少资产,则启用“自动 NuGet 还原”。",
64-
"configuration.dotnet.projects.enableFileBasedPrograms": "Enables the preview \"file-based programs\" (dotnet run app.cs) experience.",
64+
"configuration.dotnet.projects.enableFileBasedPrograms": "启用预览“基于文件的程序”(dotnet run app.cs)体验。",
6565
"configuration.dotnet.quickInfo.showRemarksInQuickInfo": "显示符号时显示备注信息。",
6666
"configuration.dotnet.server.componentPaths": "允许替代语言服务器内置组件的文件夹路径(例如,替代扩展目录中的 .roslynDevKit 路径以使用本地生成的组件)",
6767
"configuration.dotnet.server.componentPaths.roslynDevKit": "替代语言服务器的 .roslynDevKit 组件的文件夹路径",

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.80",
3+
"version": "2.81",
44
"publicReleaseRefSpec": [
55
"^refs/heads/release$",
66
"^refs/heads/prerelease$",

0 commit comments

Comments
 (0)