Skip to content

Commit

Permalink
Upgrade to 'v2.10.28'
Browse files Browse the repository at this point in the history
  • Loading branch information
muhammadsammy committed Nov 10, 2023
2 parents c63d6a1 + 9ea51d5 commit 0f79f38
Show file tree
Hide file tree
Showing 60 changed files with 2,914 additions and 567 deletions.
57 changes: 51 additions & 6 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,37 @@
"${workspaceFolder}/**",
"!**/node_modules/**"
],
"preLaunchTask": "buildDev"
"preLaunchTask": "buildDev",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Launch Current File BasicRazorApp2_1 Integration Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
// Create a temp profile that has no extensions / user settings.
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
"--profile-temp",
"${workspaceRoot}/test/razorIntegrationTests/testAssets/BasicRazorApp2_1/.vscode/lsp_tools_host_BasicRazorApp2_1.code-workspace",
"--extensionDevelopmentPath=${workspaceRoot}",
"--extensionTestsPath=${workspaceRoot}/out/test/razorIntegrationTests",
],
"env": {
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
"TEST_FILE_FILTER": "${file}"
},
"sourceMaps": true,
"outFiles": [
"${workspaceRoot}/dist/*.js",
"${workspaceRoot}/out/test/**/*.js"
],
"resolveSourceMapLocations": [
"${workspaceFolder}/**",
"!**/node_modules/**"
],
"preLaunchTask": "buildDev",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Omnisharp: Launch Current File Integration Tests",
Expand Down Expand Up @@ -101,6 +131,17 @@
],
"preLaunchTask": "buildDev"
},
{
"type": "node",
"request": "launch",
"name": "Debug gulp task",
"preLaunchTask": "build",
"program": "${workspaceFolder}/node_modules/gulp/bin/gulp.js",
"args": [
"${input:gulpTaskName}"
],
"cwd": "${workspaceFolder}"
},
{
"type": "node",
"request": "launch",
Expand All @@ -127,8 +168,8 @@
"updatePackageDependencies"
],
"env": {
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/4de42846aedae6ca331831a049a8305a/razorlanguageserver-linux-arm64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/80fc8d5b91d94f217e0a87f819ede69c/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/1f2f6b84339bc5ee331edd8685bf1dd5/razorlanguageserver-linux-musl-x64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/0b98a514b4f2720e9d49429147a8b676/razorlanguageserver-linux-x64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/5926c1d3c57ebaa85f36884781b603ed/razorlanguageserver-osx-arm64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/76a3232b4129c8e86e1cc86c10760b1e/razorlanguageserver-osx-x64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/381309a92ef7f19a36ce7460c1a2c90d/razorlanguageserver-win-arm64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/3ae268b4c3b6875ca59413caf22ae1d0/razorlanguageserver-win-x64-7.0.0-preview.23516.2.zip,https://download.visualstudio.microsoft.com/download/pr/0289a1d7-09a8-4aed-bf9a-e8942243fe9d/34238df615079d207cd1ab976e363393/razorlanguageserver-win-x86-7.0.0-preview.23516.2.zip",
"NEW_DEPS_VERSION": "7.0.0-preview.23516.2",
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/9f8414527411c020d02468b80fff0bcb/razorlanguageserver-linux-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/5a42eb01d3f32093f2d6375afee05413/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/b64dda5342f5204e530c7d5023b6f58c/razorlanguageserver-linux-musl-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/760785c241dc29d7ef7d302d0f4cb3ff/razorlanguageserver-linux-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/16cf46982673c8d73d31fbf7eb296537/razorlanguageserver-osx-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/4e58ddfbf33d25b211ed4ba91d44eb8f/razorlanguageserver-osx-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/114b672bebae3a3c491cef86fdab7ef4/razorlanguageserver-platformagnostic-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/da9092ec75455980387263797d99b7c5/razorlanguageserver-win-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/ed71f389320d0f59a12b66cf6e95c359/razorlanguageserver-win-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/b150b23785cb7c3c71114decf380e333/razorlanguageserver-win-x86-7.0.0-preview.23528.1.zip",
"NEW_DEPS_VERSION": "7.0.0-preview.23528.1",
"NEW_DEPS_ID": "Razor"
},
"cwd": "${workspaceFolder}"
Expand All @@ -143,8 +184,8 @@
"updatePackageDependencies"
],
"env": {
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/0b23b6f3f7cf31d231ba6205284521e9/devkittelemetry-linux-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/50b2adf5ee4be81c408b5abb88ab9742/devkittelemetry-linux-musl-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/d6e1c30239e8980a395c4c01cb6b867b/devkittelemetry-linux-musl-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/b4f2fb72ed2acda7263fc597fbd20882/devkittelemetry-linux-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/c1bda24c3a3a8ec6bbe3a7e28636d0b1/devkittelemetry-osx-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/3c1a78bd8fd33577f8691e122872e63e/devkittelemetry-osx-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/6f665a1dfe1d43fded3df2ddd0928236/devkittelemetry-win-arm64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/187a09b50228410a03d7e264181e2503/devkittelemetry-win-x64-7.0.0-preview.23475.5.zip,https://download.visualstudio.microsoft.com/download/pr/baaea3c9-bcff-4331-9fd2-fee91ddbfccb/bd39a95d100683454ee49cfce0a498b9/devkittelemetry-win-x86-7.0.0-preview.23475.5.zip",
"NEW_DEPS_VERSION": "7.0.0-preview.23475.5",
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/95ff1c975183590a39324be2da3dc7de/devkittelemetry-linux-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/0aa52c01416252184ee429facac46105/devkittelemetry-linux-musl-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/bca6fc6bd3a79153178f072795921f87/devkittelemetry-linux-musl-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/2068bef8944968089f5972883cc87da2/devkittelemetry-linux-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/8b24b4572e8a4108a649669740bcc44a/devkittelemetry-osx-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/7c2c6b57522154608cf4b1959f0363ee/devkittelemetry-osx-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/4e49d092100bf8167139bd1523f077ae/devkittelemetry-platformagnostic-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/e58f7d176e80e16dfcecfb84034844b0/devkittelemetry-win-arm64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/e2447a82a7190f5756a31322565f0a2e/devkittelemetry-win-x64-7.0.0-preview.23528.1.zip,https://download.visualstudio.microsoft.com/download/pr/9843ff9e-63b3-4772-8e73-1977fcd1acbc/9d55070fb7ae293f74ded5f18c7a9953/devkittelemetry-win-x86-7.0.0-preview.23528.1.zip",
"NEW_DEPS_VERSION": "7.0.0-preview.23528.1",
"NEW_DEPS_ID": "RazorTelemetry"
},
"cwd": "${workspaceFolder}"
Expand Down Expand Up @@ -184,7 +225,11 @@
"slnFilterWithCsproj",
"slnWithGenerator"
]
// type specific configuration attributes
},
{
"id": "gulpTaskName",
"description": "The name of the gulp task to debug",
"type": "promptString",
}
]
}
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)

## Latest
* Fix C# Debugger telemetry (PR: [#6627](https://github.com/dotnet/vscode-csharp/pull/6627))
* Add support for deduping build diagnostics from C# Devkit (PR: [#6543](https://github.com/dotnet/vscode-csharp/pull/6543))
* Update Roslyn to 4.9.0-1.23530.4 (PR: [#6603](https://github.com/dotnet/vscode-csharp/pull/6603))
* Enable NuGet restore commands `dotnet.restore.all` and `dotnet.restore.project` (PR: [#70588](https://github.com/dotnet/roslyn/pull/70588))
* Fix issue where server did not reload projects after NuGet restore (PR: [#70602](https://github.com/dotnet/roslyn/pull/70602))
* Update debugger to 2.9.0 (PR: [#6623](https://github.com/dotnet/vscode-csharp/pull/6623))
* Flush `Console.Write` buffer more often (Fixes: [#6598](https://github.com/dotnet/vscode-csharp/issues/6598))
* Fix logpoint freezing on start (Fixes: [#6585](https://github.com/dotnet/vscode-csharp/issues/6585))
* Fix logpoints when using variables after breakpoint breaks (Fixes: [#583](https://github.com/microsoft/vscode-dotnettools/issues/583))
* Update README.md to rename the Runtime dependency (PR: [#6617](https://github.com/dotnet/vscode-csharp/pull/6617))

## 2.9.20
* Bump Roslyn to 4.9.0-1.23526.14 (PR: [#6608](https://github.com/dotnet/vscode-csharp/pull/6608))
* Fix some project loading issues caused by evaluation failures (PR: [#70496](https://github.com/dotnet/roslyn/pull/70496))
* Ensure evaluation diagnostics are logged during project load (PR: [#70467](https://github.com/dotnet/roslyn/pull/70467))
* Include evaluation results in binlogs (PR: [#70472](https://github.com/dotnet/roslyn/pull/70472))
* Fix failure to start language server when pipe name is too long (PR: [#70492](https://github.com/dotnet/roslyn/pull/70492))
* Update Razor to 7.0.0-preview.23528.1 (PR: [#6607](https://github.com/dotnet/vscode-csharp/pull/6607))
* Support platform agnostic Razor language server & telemetry (PR: [#6600](https://github.com/dotnet/vscode-csharp/pull/6600))
* Fix issue where runtime from PATH was not found when only 7.0.100 SDK was installed (PR: [#6601](https://github.com/dotnet/vscode-csharp/pull/6601))

## 2.8.23
* Fix various failed requests in razor documents (PR: [#6580](https://github.com/dotnet/vscode-csharp/pull/6580))
* Update Roslyn to 4.9.0-1.23519.13 (PR: [#6573](https://github.com/dotnet/vscode-csharp/pull/6573))
* Filter completion list only with text before cursor (PR: [#70448](https://github.com/dotnet/roslyn/pull/70448))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ While it is possible to use the C# extension as a standalone extension, we highl

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

Note: If working on a solution that requires versions prior to .NET 6 or non-solution based projects, install a .NET Framework runtime and [MSBuild tooling](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2022).
* Set omnisharp.useModernNet to false and set dotnet.server.useOmnisharp to true
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:
default: 'default'

stages:
- template: azure-pipelines/build.yml
- template: azure-pipelines/build-all.yml
parameters:
versionNumberOverride: ${{ parameters.versionNumberOverride }}

Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pr:
- main

stages:
- template: azure-pipelines/build.yml
- template: azure-pipelines/build-all.yml

- stage: Test
displayName: Test
Expand Down
25 changes: 25 additions & 0 deletions azure-pipelines/build-all.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
parameters:
- name: versionNumberOverride
type: string
default: 'default'

stages:
- stage: Build
displayName: 'Build VSIXs'
dependsOn: []
jobs:
- template: build.yml
parameters:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
vmImageName: ubuntu-latest
platform: linux
- template: build.yml
parameters:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
vmImageName: windows-latest
platform: windows
- template: build.yml
parameters:
versionNumberOverride: ${{ parameters.versionNumberOverride }}
vmImageName: macOS-latest
platform: darwin
122 changes: 65 additions & 57 deletions azure-pipelines/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,62 +2,70 @@ parameters:
- name: versionNumberOverride
type: string
default: 'default'
- name: vmImageName
type: string
default: ''
- name: platform
type: string

jobs:
- job:
displayName: 'Build ${{ parameters.platform }} prerelease vsixs'
pool:
name: Azure Pipelines
vmImage: ${{ parameters.vmImageName }}
steps:
- checkout: self
clean: true
submodules: true
fetchTags: false
fetchDepth: 0

- template: prereqs.yml
parameters:
versionNumberOverride: ${{ parameters.versionNumberOverride }}

- script: gulp vsix:release:package:${{ parameters.platform }} --prerelease
displayName: 'Build VSIXs'

- task: PublishBuildArtifacts@1
# Run the publish step so we have vsix's even if the tests fail.
condition: succeededOrFailed()
displayName: 'Publish VSIXs'
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/vsix'
ArtifactName: 'VSIX_Prerelease_$(System.JobAttempt)'

- script: npm run test:artifacts
displayName: 'Run artifacts tests'

- job:
displayName: 'Build ${{ parameters.platform }} release vsixs'
pool:
name: Azure Pipelines
vmImage: ${{ parameters.vmImageName }}
steps:
- checkout: self
clean: true
submodules: true
fetchTags: false
fetchDepth: 0

- template: prereqs.yml
parameters:
versionNumberOverride: ${{ parameters.versionNumberOverride }}

- script: gulp vsix:release:package:${{ parameters.platform }}
displayName: 'Build VSIXs'

- task: PublishBuildArtifacts@1
# Run the publish step so we have vsix's even if the tests fail.
condition: succeededOrFailed()
displayName: 'Publish VSIXs'
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/vsix'
ArtifactName: 'VSIX_Release_$(System.JobAttempt)'

stages:
- stage: Build
displayName: 'Build VSIXs'
jobs:
- job:
displayName: 'Build Prerelease VSIXs'
steps:
- checkout: self
clean: true
submodules: true
fetchTags: false
fetchDepth: 0

- template: prereqs.yml
parameters:
versionNumberOverride: ${{ parameters.versionNumberOverride }}

- script: gulp 'vsix:release:package' --prerelease
displayName: 'Build VSIXs'

- task: PublishPipelineArtifact@1
# Run the publish step so we have vsix's even if the tests fail.
condition: succeededOrFailed()
displayName: 'Publish VSIXs'
inputs:
targetPath: '$(Build.SourcesDirectory)/vsix'
artifactName: 'VSIX_Prerelease_$(System.JobAttempt)'

- script: npm run test:artifacts
displayName: 'Run artifacts tests'

- job:
displayName: 'Build Release VSIXs'
steps:
- checkout: self
clean: true
submodules: true
fetchTags: false
fetchDepth: 0

- template: prereqs.yml
parameters:
versionNumberOverride: ${{ parameters.versionNumberOverride }}

- script: gulp 'vsix:release:package'
displayName: 'Build VSIXs'

- task: PublishPipelineArtifact@1
# Run the publish step so we have vsix's even if the tests fail.
condition: succeededOrFailed()
displayName: 'Publish VSIXs'
inputs:
targetPath: '$(Build.SourcesDirectory)/vsix'
artifactName: 'VSIX_Release_$(System.JobAttempt)'

- script: npm run test:artifacts
displayName: 'Run artifacts tests'
- script: npm run test:artifacts
displayName: 'Run artifacts tests'

1 change: 0 additions & 1 deletion azure-pipelines/loc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ stages:
fetchDepth: 0
- pwsh: |
npm install
npm install -g @vscode/l10n-dev
npm install -g gulp
displayName: 'Install tools'
- pwsh: npm run compile
Expand Down
11 changes: 11 additions & 0 deletions azure-pipelines/test-omnisharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@ steps:
env:
DISPLAY: :99.0

- task: PublishTestResults@2
condition: succeededOrFailed()
displayName: 'Publish Test Results'
inputs:
testResultsFormat: 'JUnit'
testResultsFiles: '*junit.xml'
searchFolder: '$(Build.SourcesDirectory)/out'
publishRunAttachments: true
mergeTestResults: true
testRunTitle: OmniSharp $(Agent.JobName) (Attempt $(System.JobAttempt))

- task: PublishPipelineArtifact@1
condition: failed()
displayName: 'Upload integration test logs'
Expand Down
11 changes: 11 additions & 0 deletions azure-pipelines/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@ jobs:
env:
DISPLAY: :99.0

- task: PublishTestResults@2
condition: succeededOrFailed()
displayName: 'Publish Test Results'
inputs:
testResultsFormat: 'JUnit'
testResultsFiles: '*junit.xml'
searchFolder: '$(Build.SourcesDirectory)/out'
publishRunAttachments: true
mergeTestResults: true
testRunTitle: $(Agent.JobName) (Attempt $(System.JobAttempt))

- task: PublishPipelineArtifact@1
condition: failed()
displayName: 'Upload integration test logs'
Expand Down
Loading

0 comments on commit 0f79f38

Please sign in to comment.