Skip to content

Commit a1f4c9a

Browse files
authored
Merge branch 'main' into unit_testing
2 parents e34dd4b + f62d8f1 commit a1f4c9a

21 files changed

+614
-240
lines changed

.github/release.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# .github/release.yml
2+
3+
changelog:
4+
exclude:
5+
labels:
6+
- Infrastructure
7+
categories:
8+
- title: Exciting New Features 🎉
9+
labels:
10+
- Feature Request
11+
- title: Bug fixes 🛠️
12+
labels:
13+
- bug
14+
- title: 'C# on LSP (Omnisharp Parity)'
15+
labels:
16+
- Omnisharp-Parity
17+
- title: Omnisharp (Legacy support)
18+
labels:
19+
- Omnisharp
20+
- title: Other Changes
21+
labels:
22+
- "*"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ out
88
.vs/
99
.debugger/
1010
.razor/
11+
.razoromnisharp/
1112
.vscode-test/
1213
dist/
1314
*.razor.json

.vscode/launch.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,25 @@
281281
"updatePackageDependencies"
282282
],
283283
"env": {
284-
"NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-x64-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-x86-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-arm64-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-osx-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x64-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x86-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-arm64-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-musl-x64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-musl-arm64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-x64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-linux-arm64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-osx-x64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-osx-arm64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x64-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-x86-net6.0-1.39.6.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.6/omnisharp-win-arm64-net6.0-1.39.6.zip",
285-
"NEW_DEPS_VERSION": "1.39.6"
284+
"NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-x64-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-x86-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-arm64-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-osx-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x64-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x86-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-arm64-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-musl-x64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-musl-arm64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-x64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-linux-arm64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-osx-x64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-osx-arm64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x64-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-x86-net6.0-1.39.7.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.7/omnisharp-win-arm64-net6.0-1.39.7.zip",
285+
"NEW_DEPS_VERSION": "1.39.7"
286286
},
287287
"cwd": "${workspaceFolder}"
288-
}
288+
},
289+
{
290+
"type": "node",
291+
"request": "launch",
292+
"name": "Update razor package dependencies",
293+
"preLaunchTask": "build",
294+
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
295+
"args": [
296+
"updatePackageDependencies"
297+
],
298+
"env": {
299+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/6301924acc5020d6545f4573bbb70b88/razorlanguageserver-linux-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/4e07791acfef2a373dbe497ab2477d55/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/28003bc9d9c7fdfc288dd113be8fe64d/razorlanguageserver-linux-musl-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/c22da9d1dbcbf7fd50bd893d845414d7/razorlanguageserver-linux-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/4be79e180c7421f9234ffdbed655a83c/razorlanguageserver-osx-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/814246e6af4cf35db8151d0ee0e82021/razorlanguageserver-osx-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/0b1fb7614fbe7a9a9cd2c5470c8865fa/razorlanguageserver-win-arm64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/c51fc9fae3f6fa2b1992df6dd16f50d2/razorlanguageserver-win-x64-7.0.0-preview.23301.2.zip,https://download.visualstudio.microsoft.com/download/pr/fddc6f7e-083a-44bd-9a8d-200a4146b13b/17ba6e72f65b30a6ddd68dade60343e8/razorlanguageserver-win-x86-7.0.0-preview.23301.2.zip",
300+
"NEW_DEPS_VERSION": "7.0.0-preview.23301.2"
301+
},
302+
"cwd": "${workspaceFolder}"
303+
}
289304
]
290305
}

.vscodeignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
!.roslyn/**
55
!.omnisharp/**
66
!.razor/**
7+
!.razoromnisharp/**
78
.rpt2_cache/**
89
.github/**
910
.vscode/**

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
* Renaming symbol fails within a file that had recently been renamed without saving changes.
1313
* As a workaround, make an edit within the file before using Rename Symbol.
1414

15+
## 1.26.0
16+
* Update OmniSharp to 1.39.7 (PR: [#5840](https://github.com/OmniSharp/omnisharp-vscode/pull/5840))
17+
* Respond to breaking change in VSCode 1.79.2 in completion (PR:[#2542](https://github.com/OmniSharp/omnisharp-roslyn/pull/2542))
18+
* Use dotnet-cake for build (PR:[#2537](https://github.com/OmniSharp/omnisharp-roslyn/pull/2537))
19+
* Implement LSP CodeAction resolve (PR:[#2467](https://github.com/OmniSharp/omnisharp-roslyn/pull/2467))
20+
* Update debugger to 1.25.8 (PR: [#5706](https://github.com/OmniSharp/omnisharp-vscode/pull/5706))
21+
* Updates to README, default branch and repo link (PR: [#5709](https://github.com/OmniSharp/omnisharp-vscode/pull/5709))
22+
1523
## 1.25.9
1624
* Readme updates (PR: [#5705](https://github.com/OmniSharp/omnisharp-vscode/pull/5672))
1725

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
## C# for Visual Studio Code
2-
C# is the feature-rich, language support for C# and is shipped as part of [C# Dev Kit][csdevkitextension]. This version of the extension is currently in pre-release and available for you to use today.
2+
A [Visual Studio Code](https://code.visualstudio.com/) [extension](https://marketplace.visualstudio.com/VSCode) that provides rich language support for C# and is shipped as part of [C# Dev Kit][csdevkitextension].
33

4-
C# is an extension that contributes to the [C# Dev Kit extension][csdevkitextension] for Visual Studio Code to provide performant and reliable language support. Under the hood, this extension is powered by a Language Server Protocol (LSP) Tools Host which integrates with open source components like [Roslyn](https://github.com/dotnet/roslyn) and [Razor](https://github.com/dotnet/razor) to provide rich type information and a faster, more reliable C# experience.
4+
This pre-release version of the extension is available for use today, and offers performant and reliable support for coding in C#. Powered by a Language Server Protocol (LSP) Tools Host, this extension integrates with open source components like [Roslyn](https://github.com/dotnet/roslyn) and [Razor](https://github.com/dotnet/razor) to provide rich type information and a faster, more reliable C# experience.
55

66
## Recommended Install
77
While it is possible to use the C# extension as a standalone extension, we highly recommend using [C# Dev Kit][csdevkitextension].
88

99
1. Installing [C# Dev Kit][csdevkitextension] will automatically install this extension as a required dependency
1010
2. Open a folder/workspace that contains a C# project (.csproj) and a C# solution (.sln) and the extension will activate.
11+
3. Whether you install C# Dev Kit or just the C# extension, the [.NET Runtime Installer Tool extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscode-dotnet-runtime) will be installed as a dependency.
1112

1213
Note: If working on a solution that requires versions prior to .NET 6, install a Full Framework runtime and MSBuild tooling.
1314
* Set omnisharp.useModernNet to false and if you are on the pre-release verion, set dotnet.server.useOmnisharp to true
@@ -69,4 +70,4 @@ If someone has already filed an issue that encompasses your feedback, please lea
6970
Let us know what you think of the extension by taking the quick survey.
7071

7172

72-
[csdevkitextension]: https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit
73+
[csdevkitextension]: https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit

azure-pipelines/release.yml

Lines changed: 67 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,79 @@
1-
trigger: none # We only want to trigger manually or based on resources
1+
trigger: none
22
pr: none
33

4-
resources:
5-
pipelines:
6-
- pipeline: CI
7-
source: vscode-csharp-next
8-
trigger:
9-
tags:
10-
- auto-release
4+
parameters:
5+
- name: test
6+
type: boolean
7+
default: true
8+
- name: branch
9+
type: string
10+
default: prerelease
11+
values:
12+
- prerelease
13+
- release
1114

1215
variables:
13-
- group: VisualStudioMarketplace # Expected to provide VisualStudioMarketplacePAT (https://code.visualstudio.com/api/working-with-extensions/publishing-extension#get-a-personal-access-token)
16+
# This is expected to provide VisualStudioMarketplacePAT to the release (https://code.visualstudio.com/api/working-with-extensions/publishing-extension#get-a-personal-access-token)
17+
- group: vscode-csharp release secrets
1418

1519
jobs:
16-
- job: release
20+
- job: PublishToMarketplace
1721
pool:
18-
name: AzurePipelines-EO
19-
vmImage: AzurePipelinesUbuntu20.04compliant
22+
vmImage: ubuntu-latest
2023
steps:
21-
- checkout: none
22-
- powershell: |
23-
Write-Host "##vso[build.updatebuildnumber]$(resources.pipeline.CI.runName)"
24-
if ('$(resources.pipeline.CI.runName)'.Contains('-')) {
25-
Write-Host "##vso[task.setvariable variable=IsPrerelease]true"
26-
} else {
27-
Write-Host "##vso[task.setvariable variable=IsPrerelease]false"
24+
- task: DownloadPipelineArtifact@2
25+
displayName: '📦 Download artifacts from build pipeline.'
26+
inputs:
27+
buildType: 'specific'
28+
project: 'internal'
29+
definition: 1264
30+
buildVersionToDownload: 'latestFromBranch'
31+
branchName: 'refs/heads/${{ parameters.branch }}'
32+
- pwsh: |
33+
npm install --global vsce
34+
displayName: 'Install vsce'
35+
- pwsh: |
36+
# Our build pipeline would generated build based on attempt number. Publishing the latest attempt.
37+
$allArtifacts = Get-ChildItem -Path "VSIXs - Attempt*" | Sort-Object -Descending
38+
if ($allArtifacts.Length -eq 0) {
39+
throw "No Artifacts is downloaded."
2840
}
29-
displayName: ⚙ Set up pipeline
30-
- download: CI
31-
artifact: package
32-
displayName: 🔻 Download package artifact
33-
- pwsh: | # Package publishing to pre-release https://code.visualstudio.com/api/working-with-extensions/publishing-extension#prerelease-extensions
34-
$additionalPublishArgs = 'run','vsce','publish','--skip-duplicate'
35-
if ($env:ISPRERELEASE -ne 'false') {
36-
$additionalPublishArgs += '--pre-release'
41+
42+
$publishArtifacts = $allArtifacts[0]
43+
Write-Host "All artifacts: $($allArtifacts). Publishing $($publishArtifacts)."
44+
45+
$additionalPublishArgs = , "publish"
46+
# Artifacts are published to either pre-release or release based on the build branch, https://code.visualstudio.com/api/working-with-extensions/publishing-extension#prerelease-extensions
47+
If ("${{ parameters.branch }}" -eq "prerelease") {
48+
$additionalPublishArgs += "--pre-release"
49+
Write-Host "Publish to pre-release channel."
50+
} ElseIf ("${{ parameters.branch }}" -eq "release") {
51+
Write-Host "Publish to release channel."
52+
} Else {
53+
throw "Unexpected branch name: ${{ parameters.branch }}."
3754
}
3855
$additionalPublishArgs += '--packagePath'
39-
$additionalPublishArgs += Get-ChildItem *.vsix |% { $_.Name }
40-
Write-Host "##[command]yarn $additionalPublishArgs"
41-
yarn @additionalPublishArgs
42-
displayName: 📦 Publish to Marketplace
43-
workingDirectory: $(Pipeline.Workspace)/CI/package
56+
57+
$platforms = "arm64", "x64", "ia32"
58+
$allVsixs = Get-ChildItem $publishArtifacts *.vsix
59+
foreach ($vsix in $allVsixs) {
60+
foreach ($plat in $platforms) {
61+
if ($vsix.Name.Contains($plat)) {
62+
$additionalPublishArgs += $vsix
63+
}
64+
}
65+
}
66+
67+
Write-Host "Command run is: vsce $($additionalPublishArgs)."
68+
If ("${{ parameters.test }}" -eq "true") {
69+
Write-Host "In test mode, command is printed instead of run."
70+
Write-Host "🔒 Verify PAT."
71+
vsce verify-pat ms-dotnettools
72+
}
73+
Else {
74+
vsce @additionalPublishArgs
75+
}
76+
displayName: 🚀 Publish to Marketplace
77+
workingDirectory: $(Pipeline.Workspace)
4478
env:
45-
VSCE_PAT: $(VisualStudioMarketplacePAT)
79+
VSCE_PAT: $(VSCodeMarketplacePAT)

0 commit comments

Comments
 (0)