Skip to content

Commit 690a69e

Browse files
committed
2 parents 855efda + a4e374f commit 690a69e

19 files changed

+733
-147
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/settings.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@
1111
"out/": true,
1212
"vsix/": true
1313
},
14+
"[typescript]": {
15+
"editor.defaultFormatter": "esbenp.prettier-vscode"
16+
},
1417
"csharp.suppressDotnetRestoreNotification": true,
1518
"typescript.tsdk": "./node_modules/typescript/lib",
1619
"mocha.enabled": true,
1720
"omnisharp.autoStart": false,
1821
"editor.formatOnSave": false,
19-
"eslint.lintTask.enable": true
20-
}
22+
"eslint.lintTask.enable": true,
23+
"dotnet.defaultSolution": "disable"
24+
}

.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/**

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ To **test** do the following: `npm run test` or <kbd>F5</kbd> in VS Code with th
2323

2424
### Using a locally developed Roslyn server
2525

26-
https://github.com/dotnet/roslyn contains the server implementation. Follow the instructions there to build the repo as normal. Once built, the server executable will be located in the build output directory, typically
26+
https://github.com/dotnet/roslyn contains the server implementation. Follow the instructions there to build the repo as normal. Once built, the server DLL will be located in the build output directory, typically
2727

28-
`$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net7.0/Microsoft.CodeAnalysis.LanguageServer.exe`
28+
`$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net7.0/Microsoft.CodeAnalysis.LanguageServer.dll`
2929

30-
depending on which configuration is built. Then, launch the extension here and change the VSCode setting `dotnet.server.path` to point to the Roslyn executable path you built above and restart the language server.
30+
depending on which configuration is built. Then, launch the extension here and change the VSCode setting `dotnet.server.path` to point to the Roslyn dll path you built above and restart the language server.
3131

3232
If you need to debug the server, you can set the VSCode setting `dotnet.server.waitForDebugger` to true. This will trigger a `Debugger.Launch()` on the server side as it starts.
3333

azure-pipelines/loc.yml

Whitespace-only changes.

azure-pipelines/release.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ trigger: none
22
pr: none
33

44
parameters:
5-
- name: test-run
5+
- name: test
66
type: boolean
77
default: true
88
- name: branch
@@ -42,7 +42,7 @@ jobs:
4242
$publishArtifacts = $allArtifacts[0]
4343
Write-Host "All artifacts: $($allArtifacts). Publishing $($publishArtifacts)."
4444
45-
$additionalPublishArgs = "publish","--skip-duplicate"
45+
$additionalPublishArgs = , "publish"
4646
# 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
4747
If ("${{ parameters.branch }}" -eq "prerelease") {
4848
$additionalPublishArgs += "--pre-release"
@@ -52,17 +52,25 @@ jobs:
5252
} Else {
5353
throw "Unexpected branch name: ${{ parameters.branch }}."
5454
}
55-
5655
$additionalPublishArgs += '--packagePath'
57-
$additionalPublishArgs += Get-ChildItem $publishArtifacts *.vsix
5856
59-
if ($({ parameters.test-run })) {
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") {
6069
Write-Host "In test mode, command is printed instead of run."
61-
Write-Host "Command run is: vsce $($additionalPublishArgs)."
6270
Write-Host "🔒 Verify PAT."
6371
vsce verify-pat ms-dotnettools
6472
}
65-
else {
73+
Else {
6674
vsce @additionalPublishArgs
6775
}
6876
displayName: 🚀 Publish to Marketplace

package-lock.json

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

0 commit comments

Comments
 (0)