Skip to content

Commit ad71a36

Browse files
authored
Merge prerelease to release (#8338)
2 parents 63ae32d + 89d57ae commit ad71a36

File tree

66 files changed

+901
-418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+901
-418
lines changed

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
// The profile can be found under /test/csharp-test-profile.
7777
"--profile",
7878
"csharp-test-profile",
79-
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/RazorApp.code-workspace",
79+
"${workspaceRoot}/test/razor/razorIntegrationTests/testAssets/RazorApp/.vscode/devkit_RazorApp.code-workspace",
8080
"--extensionDevelopmentPath=${workspaceRoot}",
8181
"--extensionTestsPath=${workspaceRoot}/out/test/razor/razorIntegrationTests",
8282
"--log",

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
"editor.formatOnSave": false,
2121
"eslint.lintTask.enable": true,
2222
"dotnet.defaultSolution": "disable",
23-
"jest.autoRun": "off",
23+
"jest.runMode": "on-demand",
2424
}

CHANGELOG.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,54 @@
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.80.x
7+
* Fix license link in marketplace (PR: [#8318](https://github.com/dotnet/vscode-csharp/pull/8318))
8+
* Localization (PR: [#8309](https://github.com/dotnet/vscode-csharp/pull/8309))
9+
* Re-enabling and stabilizing completion tests (PR: [#8306](https://github.com/dotnet/vscode-csharp/pull/8306))
10+
11+
# 2.79.x
12+
* Bump Roslyn to 5.0.0-1.25266.2 (PR: [#8298](https://github.com/dotnet/vscode-csharp/pull/8298))
13+
* hotfix to fix restore and stop including bin/obj artifacts in directory with loose files(PR: [#78615](https://github.com/dotnet/roslyn/pull/78615))
14+
* Ensure we pass unique binlog paths to each BuildHost(PR: [#78599](https://github.com/dotnet/roslyn/pull/78599))
15+
* Fix embedded language classification inside multi-line string(PR: [#78588](https://github.com/dotnet/roslyn/pull/78588))
16+
17+
# 2.78.x
18+
* Bump Roslyn to 5.0.0-1.25263.3 (PR: [#8287](https://github.com/dotnet/vscode-csharp/pull/8287))
19+
* File based programs IDE support(PR: [#78488](https://github.com/dotnet/roslyn/pull/78488))
20+
* Gracefully handle span mapping failing(PR: [#78520](https://github.com/dotnet/roslyn/pull/78520))
21+
* Cancel running requests when the connection terminates(PR: [#78525](https://github.com/dotnet/roslyn/pull/78525))
22+
* Cache extension method import info per project ID(PR: [#78542](https://github.com/dotnet/roslyn/pull/78542))
23+
* Fix crash in 'introduce variable' on top-level statements(PR: [#78507](https://github.com/dotnet/roslyn/pull/78507))
24+
* Fix information logs getting logged as debug in VSCode(PR: [#78522](https://github.com/dotnet/roslyn/pull/78522))
25+
* Shorten log category name(PR: [#78526](https://github.com/dotnet/roslyn/pull/78526))
26+
* Reduce allocations during SourceGeneration(PR: [#78403](https://github.com/dotnet/roslyn/pull/78403))
27+
* 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))
29+
* Compiler: Replace SyntaxListBuilder with PooledArrayBuilder<T> and miscellaneous performance tweaks (PR: [#11841](https://github.com/dotnet/razor/pull/11841))
30+
* Allow html requests to be properly cancelled (PR: [#11829](https://github.com/dotnet/razor/pull/11829))
31+
* Fuse/typeparamintellisense (PR: [#11795](https://github.com/dotnet/razor/pull/11795))
32+
* Port auto insert to VS Code (PR: [#11828](https://github.com/dotnet/razor/pull/11828))
33+
34+
# 2.77.x
35+
* Bump xamlTools to 17.14.36106.43 (PR: [#8260](https://github.com/dotnet/vscode-csharp/pull/8260))
36+
* Bump Razor to 10.0.0-preview.25256.6 (PR: [#8259](https://github.com/dotnet/vscode-csharp/pull/8259))
37+
* Improve document handling in VS Code and cohosting (#11825) (PR: [#11825](https://github.com/dotnet/razor/pull/11825))
38+
* Use new select and order method (#11826) (PR: [#11826](https://github.com/dotnet/razor/pull/11826))
39+
* Make it so validation happens after filtering and normalization (#11811) (PR: [#11811](https://github.com/dotnet/razor/pull/11811))
40+
* Port remaining cohosting endpoints to VS Code (#11815) (PR: [#11815](https://github.com/dotnet/razor/pull/11815))
41+
* Fix cohost semantic tokens in VS Code (#11816) (PR: [#11816](https://github.com/dotnet/razor/pull/11816))
42+
* Fix some hardcoded values in cohosting (#11817) (PR: [#11817](https://github.com/dotnet/razor/pull/11817))
43+
* Add new shared SelectXXXAsArray helpers (#11796) (PR: [#11796](https://github.com/dotnet/razor/pull/11796))
44+
645
# 2.76.x
746
* Bump Roslyn to 5.0.0-1.25263.2 (PR: [#8286](https://github.com/dotnet/vscode-csharp/pull/8286))
847
* [release/vscode] Gracefully handle span mapping failing(PR: [#78562](https://github.com/dotnet/roslyn/pull/78562))
948
* Fix razor redirect(PR: [#78448](https://github.com/dotnet/roslyn/pull/78448))
49+
* Bump Roslyn to 5.0.0-1.25257.6 (PR: [#8264](https://github.com/dotnet/vscode-csharp/pull/8264))
1050
* Do not parse URIs during LSP serialization/deserialization(PR: [#76691](https://github.com/dotnet/roslyn/pull/76691))
1151
* Ensure hover markdown for supported platforms uses non-breaking spaces for indentation(PR: [#78405](https://github.com/dotnet/roslyn/pull/78405))
52+
* Change O(n) + O(lg n) search in SolutionState.SortedProjectStates to just O(lg n) (#78427) (PR: [#78427](https://github.com/dotnet/roslyn/pull/78427))
53+
* Fix syntax tree creation when modifying source generated documents (#78343) (PR: [#78343](https://github.com/dotnet/roslyn/pull/78343))
1254
* Bump Razor to 10.0.0-preview.25252.1 (PR: [#8239](https://github.com/dotnet/vscode-csharp/pull/8239))
1355
* If SupportDiagnostics is false then dynamic files don't report diagnostics... (PR: #11807)
1456
* Client settings tweaks, and implement VS Code configuration monitoring (PR: #11800)

CONTRIBUTING.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- [Configuring Razor Language Server](#configuring-razor-language-server)
1414
- [Creating VSIX Packages for the Extension](#creating-vsix-packages-for-the-extension)
1515
- [Updating the `Roslyn` Language Server Version](#updating-the-roslyn-language-server-version)
16+
- [Snapping for releases](#snapping-for-releases)
1617

1718
## Setting Up Local Development Environment
1819

@@ -167,3 +168,22 @@ To update the version of the roslyn server used by the extension do the followin
167168
3. In the [package.json](package.json) inside the `defaults` section update the `roslyn` key to point to the version number you found above in step 2.
168169
4. Ensure that version of the package is in the proper feeds by running `gulp updateRoslynVersion`. Note: you may need to install the [Azure Artifacts NuGet Credential Provider](https://github.com/microsoft/artifacts-credprovider#installation-on-windows) to run interactive authentication.
169170
5. Build and test the change. If everything looks good, submit a PR.
171+
172+
## Snapping for releases
173+
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.
174+
175+
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.
176+
![branch snap action](./docs/main_snap.png)
177+
178+
This will generate two PRs that must be merged. One merging the main branch into prerelease, and the other bumps the version in main.
179+
![generated prs](./docs/generated_prs.png)
180+
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+
183+
### Marketplace release
184+
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:
185+
1. The branch will **always** be main, no matter if release a build from prerelease or release.
186+
2. Uncheck the "test" option.
187+
3. In "Resources", choose "dotnet-vscode-csharp [officialBuildCI]", then check only the build that should be released, and then confirm with "Use selected run". Based on the selected build, it will automatically determine if it is prerelease or release. ![release pipeline image](./docs/release_pipeline.png)
188+
4. The pipeline parameters should then look something like the following image. Hit "Run". ![release pipeline parameters image](./docs/release_pipeline_params.png)
189+
5. After a bit, the pipeline will request approval from an authorized approver before it actually uploads to the marketplace. Hit approve and it will continue.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Alternatively, you could visit https://github.com/dotnet/vscode-csharp/issues an
5050

5151
Copyright © .NET Foundation, and contributors.
5252

53-
The Microsoft C# extension is subject to [these license terms](RuntimeLicenses/license.txt).
53+
The Microsoft C# extension is subject to [these license terms](https://github.com/dotnet/vscode-csharp/blob/main/RuntimeLicenses/license.txt).
5454
The source code to this extension is available on [https://github.com/dotnet/vscode-csharp](https://github.com/dotnet/vscode-csharp) and licensed under the [MIT license](LICENSE.txt).
5555

5656
### Code of Conduct

docs/generated_prs.png

48.2 KB
Loading

docs/main_snap.png

99 KB
Loading

docs/release_pipeline.png

124 KB
Loading

docs/release_pipeline_params.png

40.9 KB
Loading

l10n/bundle.l10n.cs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"'{0}' was not set in the debug configuration.": "Nenastaveno v konfiguraci ladění: {0}",
66
".NET NuGet Restore": "Obnovení .NET NuGet",
77
".NET Test Log": "Protokol testů .NET",
8+
".NET: Generate Assets for Build and Debug": ".NET: generovat prostředky pro sestavení a ladění",
89
"1 reference": "1 odkaz",
910
"A valid dotnet installation could not be found: {0}": "Nepovedlo se najít platnou instalaci rozhraní dotnet: {0}",
1011
"Active File Context": "Kontext aktivního souboru",
@@ -30,6 +31,7 @@
3031
"Choose": "Zvolit",
3132
"Choose and set default": "Zvolit a nastavit výchozí",
3233
"Click {0}. This will copy all relevant issue information.": "Klikněte na {0}. Zkopírují se tím všechny relevantní informace o problému.",
34+
"Cohosting is on, client has no access to CSharp content": "Společné hostování je zapnuté, ale klient nemá přístup k obsahu CSharp",
3335
"Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "Konfigurace „{0}“ v souboru launch.json nemá argument {1} s {2} pro výpis vzdáleného procesu.",
3436
"Copy C#": "Kopírovat kód C#",
3537
"Copy Html": "Kopírovat HTML",
@@ -89,6 +91,7 @@
8991
"More Information": "Další informace",
9092
"Name not defined in current configuration.": "Název není v aktuální konfiguraci definován.",
9193
"Nested Code Action": "Akce vnořeného kódu",
94+
"No": "Ne",
9295
"No executable projects": "Žádné spustitelné projekty",
9396
"No launchable target found for '{0}'": "Pro „{0}“ se nenašel žádný spustitelný cíl",
9497
"No launchable target found.": "Nenašel se žádný spustitelný cíl.",
@@ -158,6 +161,7 @@
158161
"Synchronization timed out": "Vypršel časový limit synchronizace.",
159162
"Test run already in progress": "Už probíhá testovací běh.",
160163
"Text editor must be focused to fix all issues": "Aby bylo možné vyřešit všechny problémy, musí mít textový editor fokus.",
164+
"The '{0}' command is not recommended to be used when C# Dev Kit extension is installed. Would you like build and debug using a dynamic configuration instead?": "Příkaz {0} se nedoporučuje používat, když je nainstalováno rozšíření C# Dev Kit. Chcete místo toho sestavit a ladit pomocí dynamické konfigurace?",
161165
"The .NET Core SDK cannot be located: {0}. .NET Core debugging will not be enabled. Make sure the .NET Core SDK is installed and is on the path.": "Nelze nalézt sadu .NET Core SDK: {0}. Ladění .NET Core se nepovolí. Ujistěte se, že je sada .NET Core SDK nainstalovaná a umístěná v dané cestě.",
162166
"The .NET Core SDK located on the path is too old. .NET Core debugging will not be enabled. The minimum supported version is {0}.": "Sada .NET Core SDK umístěná v cestě je příliš stará. Ladění .NET Core se nepovolí. Minimální podporovaná verze je {0}.",
163167
"The C# extension for Visual Studio Code is incompatible on {0} {1} with the VS Code Remote Extensions. To see avaliable workarounds, click on '{2}'.": "Rozšíření jazyka C# pro Visual Studio Code není kompatibilní na {0} {1} se vzdálenými rozšířeními VS Code. Pokud chcete zobrazit dostupná alternativní řešení, klikněte na {2}.",

0 commit comments

Comments
 (0)