From aa9dc405fd85aec3a1660a5bf9d3a740829291a3 Mon Sep 17 00:00:00 2001 From: dibarbet Date: Tue, 27 May 2025 17:32:03 +0000 Subject: [PATCH 01/11] Update main version --- CHANGELOG.md | 2 ++ version.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 409d48b697..5d04582db1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951) - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) +# 2.81.x + # 2.80.x # 2.79.x diff --git a/version.json b/version.json index 50795bede0..eaccfa16e0 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "2.80", + "version": "2.81", "publicReleaseRefSpec": [ "^refs/heads/release$", "^refs/heads/prerelease$", From 08f279de9bd66523bbd8fb95b2e0b182a0d83d64 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Tue, 27 May 2025 18:08:03 +0000 Subject: [PATCH 02/11] Localization result of 9e915b023c4d64bfd48e5668617dc05977d1ec47. --- package.nls.ko.json | 2 +- package.nls.pl.json | 2 +- package.nls.zh-cn.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.nls.ko.json b/package.nls.ko.json index 3389da45bc..ffeeb0fe7a 100644 --- a/package.nls.ko.json +++ b/package.nls.ko.json @@ -61,7 +61,7 @@ "configuration.dotnet.preferCSharpExtension": "프로젝트가 C# 확장으로만 로드되도록 합니다. C# 개발 키트에서 지원되지 않는 레거시 프로젝트 형식을 사용할 때 유용할 수 있습니다(창 다시 로드 필요).", "configuration.dotnet.projects.binaryLogPath": "로드 오류를 진단하는 데 도움이 되도록 프로젝트를 로드할 때 MSBuild 이진 로그가 기록되는 경로를 설정합니다.", "configuration.dotnet.projects.enableAutomaticRestore": "확장에서 자산이 누락된 것을 감지하는 경우 자동 NuGet 복원을 사용하도록 설정합니다.", - "configuration.dotnet.projects.enableFileBasedPrograms": "Enables the preview \"file-based programs\" (dotnet run app.cs) experience.", + "configuration.dotnet.projects.enableFileBasedPrograms": "미리 보기 \"파일 기반 프로그램\"(dotnet run app.cs) 환경을 활성화합니다.", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "기호를 표시할 때 설명 정보를 표시합니다.", "configuration.dotnet.server.componentPaths": "언어 서버의 기본 제공 구성 요소에 대한 폴더 경로를 재정의할 수 있습니다(예: 로컬로 빌드된 구성 요소를 사용하도록 확장 디렉터리의 .roslynDevKit 경로 재정의).", "configuration.dotnet.server.componentPaths.roslynDevKit": "언어 서버의 .roslynDevKit 구성 요소에 대한 폴더 경로를 재정의합니다.", diff --git a/package.nls.pl.json b/package.nls.pl.json index 444fc3421e..5c37c89b31 100644 --- a/package.nls.pl.json +++ b/package.nls.pl.json @@ -61,7 +61,7 @@ "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)", "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.", "configuration.dotnet.projects.enableAutomaticRestore": "Włącza automatyczne przywracanie pakietu NuGet, jeśli rozszerzenie wykryje brak zasobów.", - "configuration.dotnet.projects.enableFileBasedPrograms": "Enables the preview \"file-based programs\" (dotnet run app.cs) experience.", + "configuration.dotnet.projects.enableFileBasedPrograms": "Włącza podgląd środowiska „programy oparte na plikach” (dotnet run app.cs).", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "Pokaż informacje o uwagach podczas wyświetlania symbolu.", "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)", "configuration.dotnet.server.componentPaths.roslynDevKit": "Przesłania ścieżkę folderu dla składnika roslynDevKit serwera językowego", diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json index f064968901..29cd31047a 100644 --- a/package.nls.zh-cn.json +++ b/package.nls.zh-cn.json @@ -61,7 +61,7 @@ "configuration.dotnet.preferCSharpExtension": "仅强制使用 C# 扩展加载项目。使用 C# Dev Kit 不支持的旧项目类型时，这可能很有用。(需要重新加载窗口)", "configuration.dotnet.projects.binaryLogPath": "设置在加载项目时写入 MSBuild 二进制日志的路径，以帮助诊断加载错误。", "configuration.dotnet.projects.enableAutomaticRestore": "如果扩展检测到缺少资产，则启用“自动 NuGet 还原”。", - "configuration.dotnet.projects.enableFileBasedPrograms": "Enables the preview \"file-based programs\" (dotnet run app.cs) experience.", + "configuration.dotnet.projects.enableFileBasedPrograms": "启用预览“基于文件的程序”（dotnet run app.cs）体验。", "configuration.dotnet.quickInfo.showRemarksInQuickInfo": "显示符号时显示备注信息。", "configuration.dotnet.server.componentPaths": "允许替代语言服务器内置组件的文件夹路径(例如，替代扩展目录中的 .roslynDevKit 路径以使用本地生成的组件)", "configuration.dotnet.server.componentPaths.roslynDevKit": "替代语言服务器的 .roslynDevKit 组件的文件夹路径", From bcf2e944ef2d3fb6f968cb5899341c3161a4e7b6 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Thu, 29 May 2025 12:59:01 -0700 Subject: [PATCH 03/11] update environment approval for release pipeline --- azure-pipelines/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml index e915c5e8a9..f99f3e50bc 100644 --- a/azure-pipelines/release.yml +++ b/azure-pipelines/release.yml @@ -34,7 +34,7 @@ extends: jobs: - deployment: PublishToMarketplace displayName: PublishToMarketplace - environment: vscode-csharp-release-approvals + environment: vscode-csharp-release pool: name: netcore1espool-internal image: 1es-ubuntu-2204 From 3f6830f90271bd268ee2afe95f6fd52b309228df Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Thu, 29 May 2025 13:30:59 -0700 Subject: [PATCH 04/11] Update Debugger Packages to v2.81.0 (#8329) --- package.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index f6f358e6f6..b977ea6a2a 100644 --- a/package.json +++ b/package.json @@ -425,7 +425,7 @@ { "id": "Debugger", "description": ".NET Core Debugger (Windows / x64)", - "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-win7-x64.zip", + "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-win7-x64.zip", "installPath": ".debugger/x86_64", "platforms": [ "win32" @@ -435,12 +435,12 @@ "arm64" ], "installTestPath": "./.debugger/x86_64/vsdbg-ui.exe", - "integrity": "3696E84C5CB4D22DDD6B4EDFA28DAE7B41783665F49F3863CA32629E4DBB8D91" + "integrity": "5C7C000F23267EB15FE6D517156417508C772AD6CEB4D7D8AFAE4CD81B826452" }, { "id": "Debugger", "description": ".NET Core Debugger (Windows / ARM64)", - "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-win10-arm64.zip", + "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-win10-arm64.zip", "installPath": ".debugger/arm64", "platforms": [ "win32" @@ -449,12 +449,12 @@ "arm64" ], "installTestPath": "./.debugger/arm64/vsdbg-ui.exe", - "integrity": "A5460716A03352DE2EE87D212F0E69CB95037BA825258BBF0EBDCEC26365406E" + "integrity": "86E2B48A5F405CFF4A99A3C4236DE7355DFF8F9EFEBE1A204B21B80CD140F394" }, { "id": "Debugger", "description": ".NET Core Debugger (macOS / x64)", - "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-osx-x64.zip", + "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-osx-x64.zip", "installPath": ".debugger/x86_64", "platforms": [ "darwin" @@ -468,12 +468,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/x86_64/vsdbg-ui", - "integrity": "85DD2B0405AA6E5AEACF3B782A9D843550F4CD542C79556992B55D9A782D0EA0" + "integrity": "16BAC2DEBD47C23B3682801E263395492BEE73BF2DD326BF132A397B7A08984E" }, { "id": "Debugger", "description": ".NET Core Debugger (macOS / arm64)", - "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-osx-arm64.zip", + "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-osx-arm64.zip", "installPath": ".debugger/arm64", "platforms": [ "darwin" @@ -486,12 +486,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/arm64/vsdbg-ui", - "integrity": "FBE989F678A7CA4E0E64ABF5C48D53DF16998B6553566436EBA44FEB06126BCA" + "integrity": "C335E8E06F8391B2CF2F85352D62ED736FD3CEF1A37BEEE9E47700EC8CD454DC" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / ARM)", - "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-linux-arm.zip", + "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-linux-arm.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -504,12 +504,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "C7E56E994E8386D26B8A921DF3C28F25D862C1163FEC4006F935A76855DF7FC4" + "integrity": "552FD02F8C89616498CF95FE1F9229C69E1AE2A594E63CA6989405397CE37BE6" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / ARM64)", - "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-linux-arm64.zip", + "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-linux-arm64.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -522,12 +522,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "5F84A51AA7CF4477CCB6294DCB98A298466F56D98A61B4A4BDE30A6CC42058E4" + "integrity": "EF74A61BA674B926F4570EE0FF8A2FDEE5ABC5BF1400980B1D750CF459D0576F" }, { "id": "Debugger", "description": ".NET Core Debugger (linux musl / x64)", - "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-linux-musl-x64.zip", + "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-linux-musl-x64.zip", "installPath": ".debugger", "platforms": [ "linux-musl" @@ -540,12 +540,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "727B0E11D11F3666C0B713B9F1775842978552A1ED2DB4EBEDA01DF6DDA1A5B6" + "integrity": "3A68871DA6C875FF1DE326D29C8A1068C0CBF81DC8455854C6D1F8A84D6327CD" }, { "id": "Debugger", "description": ".NET Core Debugger (linux musl / ARM64)", - "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-linux-musl-arm64.zip", + "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-linux-musl-arm64.zip", "installPath": ".debugger", "platforms": [ "linux-musl" @@ -558,12 +558,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "E99EA50B83F6C998B6A95A2E73EC8CFD4BCDDE50FAF741A9B704444038D69BF3" + "integrity": "5551419BE51F923CC2B3A566760ED88368F191C75162CBAAB55B66BE6B67ECAE" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / x64)", - "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-72-0/coreclr-debug-linux-x64.zip", + "url": "https://vsdebugger-cyg0dxb6czfafzaz.b01.azurefd.net/coreclr-debug-2-81-0/coreclr-debug-linux-x64.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -576,7 +576,7 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "6C19A387671FF9114F375025556C6D331476D85C06274CB7C015B2135A7E7F99" + "integrity": "4BC2101C38261EDAB3BBAE6DA2CC2D5B08D4FD85E19A2A8C9764778E54AC4A66" }, { "id": "RazorOmnisharp", @@ -5623,4 +5623,4 @@ } } } -} +} \ No newline at end of file From b78242a1d2a310813a62e4149eb1f843c9e8f9c8 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Tue, 27 May 2025 11:06:28 -0700 Subject: [PATCH 05/11] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d04582db1..d35930226b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ # 2.81.x # 2.80.x +* Fix license link in marketplace (PR: [#8318](https://github.com/dotnet/vscode-csharp/pull/8318)) +* Localization (PR: [#8309](https://github.com/dotnet/vscode-csharp/pull/8309)) +* Re-enabling and stabilizing completion tests (PR: [#8306](https://github.com/dotnet/vscode-csharp/pull/8306)) # 2.79.x * Bump Roslyn to 5.0.0-1.25266.2 (PR: [#8298](https://github.com/dotnet/vscode-csharp/pull/8298)) From aa4edefd7885c84fff2404c770fe29064231a433 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Fri, 30 May 2025 14:55:21 -0700 Subject: [PATCH 06/11] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d04582db1..c36103bea9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) # 2.81.x +* Update Debugger Packages to v2.81.0(PR: [#8329](https://github.com/dotnet/vscode-csharp/pull/8329)) +* Localization changes (PR: [#8327](https://github.com/dotnet/vscode-csharp/pull/8327)) # 2.80.x From 69eae400b8ea08c734fb182998a3f88c8b8358b3 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Mon, 2 Jun 2025 10:57:04 +1000 Subject: [PATCH 07/11] Bump Razor to 10.0.0-preview.25279.1 --- CHANGELOG.md | 18 +++++++++++++++--- package.json | 4 ++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e5cbb4ee7..f1b4fe1b4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,21 @@ - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951) - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) +# 2.82.x +* Bump Razor to 10.0.0-preview.25279.1 (PR: [#](https://github.com/dotnet/vscode-csharp/pull/)) + * Don't produce RazorSourceDocuments for imports with incorrect file paths (#11897) (PR: [#11897](https://github.com/dotnet/razor/pull/11897)) + * Fixes one of the cases in directive attribute completion (#11896) (PR: [#11896](https://github.com/dotnet/razor/pull/11896)) + * Reduce costs in ComponentDirectiveVisitor.VisitRazorDirective (#11881) (PR: [#11881](https://github.com/dotnet/razor/pull/11881)) + * Compiler: Rationalize nodes, tokens, visitors, walkers, and rewriters, oh my! (#11853) (PR: [#11853](https://github.com/dotnet/razor/pull/11853)) + * Reduce allocations in TagHelperParseTreeRewriter.Rewrite (#11882) (PR: [#11882](https://github.com/dotnet/razor/pull/11882)) + * Propagate DynamicallyAccessedMembersAttribute to type inference method (#11856) (PR: [#11856](https://github.com/dotnet/razor/pull/11856)) + * Tooling: Don't throw exceptions when generating code for file rooted outside of project (#11864) (PR: [#11864](https://github.com/dotnet/razor/pull/11864)) + * Ensure @model types have a mapping in razor pages (#11844) (PR: [#11844](https://github.com/dotnet/razor/pull/11844)) + * Fix aligned buffer write (#11861) (PR: [#11861](https://github.com/dotnet/razor/pull/11861)) + # 2.81.x -* Update Debugger Packages to v2.81.0(PR: [#8329](https://github.com/dotnet/vscode-csharp/pull/8329)) -* Localization changes (PR: [#8327](https://github.com/dotnet/vscode-csharp/pull/8327)) +* Update Debugger Packages to v2.81.0(PR: [#8329](https://github.com/dotnet/vscode-csharp/pull/8329)) +* Localization changes (PR: [#8327](https://github.com/dotnet/vscode-csharp/pull/8327)) # 2.80.x * Fix license link in marketplace (PR: [#8318](https://github.com/dotnet/vscode-csharp/pull/8318)) @@ -29,7 +41,7 @@ * Shorten log category name(PR: [#78526](https://github.com/dotnet/roslyn/pull/78526)) * Reduce allocations during SourceGeneration(PR: [#78403](https://github.com/dotnet/roslyn/pull/78403)) * Fix razor redirect(PR: [#78448](https://github.com/dotnet/roslyn/pull/78448)) -* Bump Razor to 10.0.0-preview.25262.1(PR: [#8283](https://github.com/dotnet/vscode-csharp/pull/8283)) +* Bump Razor to 10.0.0-preview.25262.1 (PR: [#8283](https://github.com/dotnet/vscode-csharp/pull/8283)) * Compiler: Replace SyntaxListBuilder with PooledArrayBuilder and miscellaneous performance tweaks (PR: [#11841](https://github.com/dotnet/razor/pull/11841)) * Allow html requests to be properly cancelled (PR: [#11829](https://github.com/dotnet/razor/pull/11829)) * Fuse/typeparamintellisense (PR: [#11795](https://github.com/dotnet/razor/pull/11795)) diff --git a/package.json b/package.json index b977ea6a2a..61c347b6ca 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "defaults": { "roslyn": "5.0.0-1.25266.2", "omniSharp": "1.39.12", - "razor": "10.0.0-preview.25262.1", + "razor": "10.0.0-preview.25279.1", "razorOmnisharp": "7.0.0-preview.23363.1", "xamlTools": "17.14.36106.43" }, @@ -5623,4 +5623,4 @@ } } } -} \ No newline at end of file +} From e48c8573988abd39d8fe416cd49cabb99c094b56 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Mon, 2 Jun 2025 10:57:55 +1000 Subject: [PATCH 08/11] Update PR numbers --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1b4fe1b4f..6a6a46c6f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) # 2.82.x -* Bump Razor to 10.0.0-preview.25279.1 (PR: [#](https://github.com/dotnet/vscode-csharp/pull/)) +* Bump Razor to 10.0.0-preview.25279.1 (PR: [#8336](https://github.com/dotnet/vscode-csharp/pull/8336)) * Don't produce RazorSourceDocuments for imports with incorrect file paths (#11897) (PR: [#11897](https://github.com/dotnet/razor/pull/11897)) * Fixes one of the cases in directive attribute completion (#11896) (PR: [#11896](https://github.com/dotnet/razor/pull/11896)) * Reduce costs in ComponentDirectiveVisitor.VisitRazorDirective (#11881) (PR: [#11881](https://github.com/dotnet/razor/pull/11881)) From 06e169b9caee2329757d4000c7d759141a44080e Mon Sep 17 00:00:00 2001 From: David Barbet Date: Mon, 2 Jun 2025 11:27:16 -0700 Subject: [PATCH 09/11] Fix snap instructions --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ade3132f5a..dd7cc9b3dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -172,13 +172,15 @@ To update the version of the roslyn server used by the extension do the followin ## Snapping for releases 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. +### Snap main -> prerelease 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. ![branch snap action](./docs/main_snap.png) This will generate two PRs that must be merged. One merging the main branch into prerelease, and the other bumps the version in main. ![generated prs](./docs/generated_prs.png) -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. +### Snap prerelease -> release +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. ### Marketplace release 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: From 401ecd8926a855a5cb3fe8a09f898ea440180803 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Mon, 2 Jun 2025 13:51:22 -0700 Subject: [PATCH 10/11] Fix environment name the old environment was deleted, and the new one was renamed back to the old name. So now have to update this --- azure-pipelines/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml index f99f3e50bc..e915c5e8a9 100644 --- a/azure-pipelines/release.yml +++ b/azure-pipelines/release.yml @@ -34,7 +34,7 @@ extends: jobs: - deployment: PublishToMarketplace displayName: PublishToMarketplace - environment: vscode-csharp-release + environment: vscode-csharp-release-approvals pool: name: netcore1espool-internal image: 1es-ubuntu-2204 From 54d6cad4b2db7416c735fa39c2dafedbcae02f15 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Mon, 2 Jun 2025 16:52:45 -0700 Subject: [PATCH 11/11] Update CHANGELOG.md --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a6a46c6f8..c1d633d9ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ - Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951) - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) -# 2.82.x +# 2.81.x * Bump Razor to 10.0.0-preview.25279.1 (PR: [#8336](https://github.com/dotnet/vscode-csharp/pull/8336)) * Don't produce RazorSourceDocuments for imports with incorrect file paths (#11897) (PR: [#11897](https://github.com/dotnet/razor/pull/11897)) * Fixes one of the cases in directive attribute completion (#11896) (PR: [#11896](https://github.com/dotnet/razor/pull/11896)) @@ -14,8 +14,6 @@ * Tooling: Don't throw exceptions when generating code for file rooted outside of project (#11864) (PR: [#11864](https://github.com/dotnet/razor/pull/11864)) * Ensure @model types have a mapping in razor pages (#11844) (PR: [#11844](https://github.com/dotnet/razor/pull/11844)) * Fix aligned buffer write (#11861) (PR: [#11861](https://github.com/dotnet/razor/pull/11861)) - -# 2.81.x * Update Debugger Packages to v2.81.0(PR: [#8329](https://github.com/dotnet/vscode-csharp/pull/8329)) * Localization changes (PR: [#8327](https://github.com/dotnet/vscode-csharp/pull/8327))