Merge pull request #5835 from dotnet/main

Merge main into prerelease

Author: dibarbet

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-## Known Issues in 1.25.1
+## Known Issues in 1.25.8
 
 * For Mono-based development (e.g. Unity) that requires full .NET framework, you need to set `"omnisharp.useModernNet": false`.
 * After selecting a solution filter (*.slnf) from the project selector, the solution's name will be displayed in the status bar instead of the filter's.
@@ -12,6 +12,15 @@
 * Renaming symbol fails within a file that had recently been renamed without saving changes.
   * As a workaround, make an edit within the file before using Rename Symbol.
 
+## 1.25.9
+* Readme updates (PR: [#5705](https://github.com/OmniSharp/omnisharp-vscode/pull/5672))
+
+## 1.25.8
+* Update Razor to 7.0.0-preview.23258.1 (PR: [#5672](https://github.com/OmniSharp/omnisharp-vscode/pull/5672))
+  * Fix issue with Razor attribute hover and Go to Definition (PR: [#8653](https://github.com/dotnet/razor/pull/8653))
+  * Fix issue with Razor formatting (PR: [#8669](https://github.com/dotnet/razor/pull/8669))
+* Combine test compile step into normal compile (PR: [#5666](https://github.com/OmniSharp/omnisharp-vscode/pull/5666))
+
 ## 1.25.7
 * Update Razor to 7.0.0-preview.23224.3 (PR: [#5660](https://github.com/OmniSharp/omnisharp-vscode/pull/5660))
   * Fix issue with Razor diagnostics (PR: [#8622](https://github.com/dotnet/razor/pull/8622))
@@ -1158,7 +1167,7 @@ The 1.8 release makes a major change to how the debugger works under the hood. T
 Changes:
 
 * The module load messages in the output window are now more detailed and hopefully less confusing. ([#837](https://github.com/OmniSharp/omnisharp-vscode/issues/837))
-* Programs can now be launched into VS Code's integrated terminal. ([documentation](https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger.md#console-terminal-window))
+* Programs can now be launched into VS Code's integrated terminal. ([documentation](https://github.com/dotnet/vscode-csharp/blob/main/debugger.md#console-terminal-window))
 * VS Code recently introduced [column breakpoint support](https://code.visualstudio.com/updates/v1_10#_column-breakpoints) and they are now enabled for C#.
 * React to the VS Code change to use `${command:` instead of `${command.`. ([#1275](https://github.com/OmniSharp/omnisharp-vscode/issues/1275))
 * Fix a problem with browser launch support that could lead to debugger session's being aborted when the browser is started. ([#1274](https://github.com/OmniSharp/omnisharp-vscode/issues/1274))

.github/workflows/release-ci.yml

@@ -1 +1,3 @@
-* @microsoft/roslyn-ide
+* @dotnet/roslyn-ide
+/src/coreclr-debug/ @dotnet/ide-debugger-contracts
+/src/razor/ @dotnet/razor-tooling

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 First install:
 
-* Node.js ([v16.16 LTS](https://nodejs.org/en/blog/release/v16.16.0) is recommended.  Later versions will fail to build).
+* Node.js ([v16.16 LTS](https://nodejs.org/en/blog/release/v16.16.0) is recommended).
 * Npm (The version shipped with node is fine, for example for v16.16.0 it would be 8.19.2)
 * .NET 7.0 SDK (dotnet should be on your path)
 
@@ -15,9 +15,6 @@ To run and develop the extension do the following:
 * Run `npm i`
 * Run `npm i -g gulp`
 * Run `gulp installDependencies` (this will download the various dependencies as specified by the version in the [package.json](package.json))
-  * A common error you may run into is `NU1301: Unable to load the service index for source https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json`. 
-  To resolve this error, try running `dotnet restore --interactive server/ /p:MicrosoftCodeAnalysisLanguageServerVersion=version_number` with `version_number` replaced with the version number found in [package.json](package.json) inside the `defaults` section under the `roslyn` key.
-  If this does not work, install [azure artifacts nuget credential provider](https://github.com/microsoft/artifacts-credprovider#installation-on-windows) then rerun the previous command.
 * Open in Visual Studio Code (`code .`)
 * _Optional:_ run `npm run watch`, make code changes
 * Press <kbd>F5</kbd> to debug
@@ -26,7 +23,7 @@ To **test** do the following: `npm run test` or <kbd>F5</kbd> in VS Code with th
 
 ### Using a locally developed Roslyn server
 
-https://dnceng.visualstudio.com/internal/_git/dotnet-roslyn?version=GBfeatures%2Flsp_tools_host 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 
+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 
 
 `$roslynRepoRoot/artifacts/bin/Microsoft.CodeAnalysis.LanguageServer/Debug/net7.0/Microsoft.CodeAnalysis.LanguageServer.exe`
 
@@ -41,7 +38,8 @@ VSIXs can be created using the gulp command `gulp vsix:release:package`.  This w
 ## Updating the Roslyn server version
 
 To update the version of the roslyn server used by the extension do the following:
-1.  Find the the Roslyn signed build you want from [here](https://dnceng.visualstudio.com/internal/_build?definitionId=327&branchFilter=246637%2C246637).  Typically the latest successful build is fine.
-2.  In the official build stage, look for the `Publish Language Server Executables` step.  In there you will see it publishing the `Microsoft.CodeAnalysis.LanguageServer` package with some version, e.g. `4.6.0-3.23158.4`.  Take note of that version number.
+1.  Find the the Roslyn signed build you want from [here](https://dnceng.visualstudio.com/internal/_build?definitionId=327&_a=summary).  Typically the latest successful build of main is fine.
+2.  In the official build stage, look for the `Publish Assets` step.  In there you will see it publishing the `Microsoft.CodeAnalysis.LanguageServer` package with some version, e.g. `4.6.0-3.23158.4`.  Take note of that version number.
 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.
-4.  Build and test the change (make sure to run `gulp installDependencies` to get the new version!).  If everything looks good, submit a PR.
+4.  Build and test the change (make sure to run `gulp installDependencies` to get the new version!).  If everything looks good, submit a PR.
+    * Adding new package versions might require authentication, run with the `--interactive` flag to login.  You may need to install [azure artifacts nuget credential provider](https://github.com/microsoft/artifacts-credprovider#installation-on-windows) to run interactive authentication.

CODEOWNERS

@@ -0,0 +1,25 @@
+trigger:
+  branches:
+    include:
+    - main
+    - prerelease
+pr: none
+
+variables:
+  - name: prereleaseFlag
+    value: '--prerelease'
+
+stages:
+- stage: Build
+  dependsOn: []
+  jobs:
+  - job: Build
+    steps:
+    - template: azure-pipelines/build.yml
+      parameters:
+        prereleaseFlag: $(prereleaseFlag)
+    pool:
+      name: NetCore1ESPool-Internal
+      demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+
+# TODO: add compliance, signing.

CONTRIBUTING.md

@@ -4,12 +4,12 @@ trigger:
     include:
     - feature/*
     - prerelease
-    - release
+    - main
 
 pr:
 - feature/*
 - prerelease
-- release
+- main
 
 variables:
   - name: prereleaseFlag
@@ -24,6 +24,9 @@ stages:
     - template: azure-pipelines/build.yml
       parameters:
         prereleaseFlag: $(prereleaseFlag)
+    pool:
+      name: NetCore-Public
+      demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
 
 - stage: Test
   displayName: Test
@@ -33,10 +36,9 @@ stages:
     strategy:
       matrix:
         linux:
-          vmImage: ubuntu-latest
+          demandsName: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
     pool:
-      vmImage: $(vmImage)
+      name: NetCore-Public
+      demands: $(demandsName)
     steps:
     - template: azure-pipelines/test.yml
-
-# TODO: add compliance stage

azure-pipelines-official.yml

@@ -9,10 +9,10 @@ schedules:
     - feature/lsp_tools_host
 
 parameters:
-- name: InsertTargetBranch
-  displayName: Target branch
-  type: string
-  default: main
+  - name: InsertTargetBranch
+    displayName: Target branch
+    type: string
+    default: main
 
 resources:
   pipelines:
@@ -87,16 +87,23 @@ jobs:
           $vsix = $_.FullName
           $npmName = "@microsoft/csharp-vscode-extension.$os-$arch"
 
-          Write-Host "##[group]Translating $os-$arch VSIX to NPM package $npmName"
-          $packageStagingDir = "$(Agent.TempDirectory)/csharp/$os-$arch"
-          New-Item -Type Directory -Path $packageStagingDir | Set-Location
-          Spawn-Tool '7z' ('x', '-y', $vsix)
-          Set-Content -Path package.json -Value "{`n  `"description`": `"C# for Visual Studio Code ($os-$arch) as NPM package for insertion into the C# Dev Kit extension for testing.`"`n}"
-          Spawn-Tool 'npm' ('pkg','set',"name=$npmName","version=$version",'publishConfig.registry=https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/vs-green/npm/registry/','repository.type=git','repository.url=https://devdiv.visualstudio.com/DevDiv/_git/vscode-csharp-next',"repository.commit=$(resources.pipeline.BlueCI.sourceCommit)")
-          Get-Content -Path package.json
-          Spawn-Tool 'npm' @('publish','--userconfig','$(Pipeline.Workspace)/.npmrc')
-          $InsertNpmDependencies += "$npmName@$version "
-          Write-Host "##[endgroup]"
+          $packageNameAndVersion = "$npmName@$version"
+          $InsertNpmDependencies += "$packageNameAndVersion "
+          & npm view $packageNameAndVersion --userconfig $(Pipeline.Workspace)/.npmrc
+          # If the command succeeded it means the package is already published, so we need to skip it.
+          if ($LASTEXITCODE -eq 0) {
+            Write-Host "$packageNameAndVersion is already published, skipping."
+          } else {
+            Write-Host "##[group]Translating $os-$arch VSIX to NPM package $npmName"
+            $packageStagingDir = "$(Agent.TempDirectory)/csharp/$os-$arch"
+            New-Item -Type Directory -Path $packageStagingDir | Set-Location
+            Spawn-Tool '7z' ('x', '-y', $vsix)
+            Set-Content -Path package.json -Value "{`n  `"description`": `"C# for Visual Studio Code ($os-$arch) as NPM package for insertion into the C# Dev Kit extension for testing.`"`n}"
+            Spawn-Tool 'npm' ('pkg','set',"name=$npmName","version=$version",'publishConfig.registry=https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/vs-green/npm/registry/','repository.type=git','repository.url=https://devdiv.visualstudio.com/DevDiv/_git/vscode-csharp-next',"repository.commit=$(resources.pipeline.BlueCI.sourceCommit)")
+            Get-Content -Path package.json
+            Spawn-Tool 'npm' @('publish','--userconfig','$(Pipeline.Workspace)/.npmrc')
+            Write-Host "##[endgroup]"
+          }
         }
       }
 

azure-pipelines.yml

@@ -9,11 +9,15 @@ steps:
     versionSpec: '16.x'
 
 - task: UseDotNet@2
+  displayName: 'Install .NET Core SDKs'
+  inputs:
+    version: '7.0.100'
 
 # Set the CI build number to the VSIX version we're creating from this build.
 - script: |
     dotnet tool install --tool-path $(Agent.BuildDirectory) nbgv
     $(Agent.BuildDirectory)/nbgv cloud
+  displayName: Install nbgv
 
 - script: |
     npm ci