Skip to content

Commit

Permalink
[automated] Merge branch 'prerelease' => 'release' (#7952)
Browse files Browse the repository at this point in the history
  • Loading branch information
dibarbet authored Feb 1, 2025
2 parents 59c9c25 + f023efc commit 442cbe0
Show file tree
Hide file tree
Showing 62 changed files with 732 additions and 337 deletions.
100 changes: 50 additions & 50 deletions .config/1espt/PipelineAutobaseliningConfig.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.

pipelines:
1275:
retail:
source:
credscan:
lastModifiedDate: 2024-03-18
eslint:
lastModifiedDate: 2024-03-18
armory:
lastModifiedDate: 2024-03-18
psscriptanalyzer:
lastModifiedDate: 2024-04-19
binary:
credscan:
lastModifiedDate: 2024-03-18
binskim:
lastModifiedDate: 2024-03-18
spotbugs:
lastModifiedDate: 2024-04-19
1264:
retail:
source:
credscan:
lastModifiedDate: 2024-03-19
eslint:
lastModifiedDate: 2024-03-19
psscriptanalyzer:
lastModifiedDate: 2024-03-19
armory:
lastModifiedDate: 2024-03-19
policheck:
lastModifiedDate: 2024-06-27
binary:
credscan:
lastModifiedDate: 2024-03-19
binskim:
lastModifiedDate: 2024-03-19
spotbugs:
lastModifiedDate: 2024-03-19
1271:
retail:
source:
credscan:
lastModifiedDate: 2024-03-27
eslint:
lastModifiedDate: 2024-03-27
psscriptanalyzer:
lastModifiedDate: 2024-03-27
armory:
lastModifiedDate: 2024-03-27
pipelines:
1275:
retail:
source:
credscan:
lastModifiedDate: 2024-03-18
eslint:
lastModifiedDate: 2024-03-18
armory:
lastModifiedDate: 2024-03-18
psscriptanalyzer:
lastModifiedDate: 2024-04-19
binary:
credscan:
lastModifiedDate: 2024-03-18
binskim:
lastModifiedDate: 2025-01-10
spotbugs:
lastModifiedDate: 2024-04-19
1264:
retail:
source:
credscan:
lastModifiedDate: 2024-03-19
eslint:
lastModifiedDate: 2024-03-19
psscriptanalyzer:
lastModifiedDate: 2024-03-19
armory:
lastModifiedDate: 2024-03-19
policheck:
lastModifiedDate: 2024-06-27
binary:
credscan:
lastModifiedDate: 2024-03-19
binskim:
lastModifiedDate: 2025-01-10
spotbugs:
lastModifiedDate: 2024-03-19
1271:
retail:
source:
credscan:
lastModifiedDate: 2024-03-27
eslint:
lastModifiedDate: 2024-03-27
psscriptanalyzer:
lastModifiedDate: 2024-03-27
armory:
lastModifiedDate: 2024-03-27
48 changes: 23 additions & 25 deletions .config/guardian/.gdnbaselines
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
{
"hydrated": false,
"properties": {
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines",
"hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
},
"version": "1.0.0",
"baselines": {
"default": {
"name": "default",
"createdDate": "2024-09-09 19:35:36Z",
"lastUpdatedDate": "2024-09-09 19:35:36Z"
}
},
"results": {
"26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb": {
"signature": "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb",
"alternativeSignatures": [],
"memberOf": [
"default"
],
"createdDate": "2024-09-09 19:35:36Z"
}
}
}
{
"properties": {
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
},
"version": "1.0.0",
"baselines": {
"default": {
"name": "default",
"createdDate": "2024-09-09 19:35:36Z",
"lastUpdatedDate": "2024-09-09 19:35:36Z"
}
},
"results": {
"26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb": {
"signature": "26445e3e484940d2d58c2ffc32ab3895fca4b1589d66e2f2dee2fa01f2c479fb",
"alternativeSignatures": [],
"memberOf": [
"default"
],
"createdDate": "2024-09-09 19:35:36Z"
}
}
}
12 changes: 6 additions & 6 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"preLaunchTask": "buildDev"
},
{
"name": "Launch Current File slnWithCsproj Integration Tests",
"name": "[Roslyn] Run Current File Integration Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
Expand All @@ -39,7 +39,7 @@
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "[DevKit] Launch Current File slnWithCsproj Integration Tests",
"name": "[DevKit] Run Current File Integration Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
Expand Down Expand Up @@ -93,7 +93,7 @@
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Omnisharp: Launch Current File Integration Tests",
"name": "[O#] Run Current File Integration Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
Expand All @@ -115,10 +115,10 @@
"sourceMaps": true,
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
"preLaunchTask": "buildDev"
"preLaunchTask": "buildTest"
},
{
"name": "Omnisharp: Launch Current File Integration Tests [LSP]",
"name": "[O# LSP] Run Current File Integration Tests",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
Expand All @@ -140,7 +140,7 @@
"sourceMaps": true,
"outFiles": ["${workspaceRoot}/dist/*.js", "${workspaceRoot}/out/test/**/*.js"],
"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
"preLaunchTask": "buildDev"
"preLaunchTask": "buildTest"
},
{
"type": "node",
Expand Down
70 changes: 70 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,76 @@
- Diagnostics related feature requests and improvements [#5951](https://github.com/dotnet/vscode-csharp/issues/5951)
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)

# 2.63.x
* Bump xamlTools to 17.14.35723.260 (PR: [#7932](https://github.com/dotnet/vscode-csharp/pull/7941))
* Update Roslyn to 4.14.0-1.25074.7 (PR: [#7942](https://github.com/dotnet/vscode-csharp/pull/7942))
* Enable extract refactorings in LSP (PR: [#76718](https://github.com/dotnet/roslyn/pull/76718))
* Speed up 'fix all' for 'use auto prop' by running in parallel (PR: [#76905](https://github.com/dotnet/roslyn/pull/76905))
* Add support for converting an auto-prop to a field-backed property. (PR: [#76900](https://github.com/dotnet/roslyn/pull/76900))
* Fix throw in generator comparer (PR: [#76769](https://github.com/dotnet/roslyn/pull/76769))
* Do not offer the containing type when offering completion in teh base-list (PR: [#76891](https://github.com/dotnet/roslyn/pull/76891))
* Improve handling bad metadata in EE (PR: [#76878](https://github.com/dotnet/roslyn/pull/76878))
* Record completion of "Simple lambda parameters with modifiers" feature (PR: [#76884](https://github.com/dotnet/roslyn/pull/76884))
* Reduce work in ConversionsBase.AddUserDefinedConversionsToExplicitCandidateSet (PR: [#76835](https://github.com/dotnet/roslyn/pull/76835))
* Update formatOnType handler to support formatting on NewLine (PR: [#76876](https://github.com/dotnet/roslyn/pull/76876))
* Fix new document formatting (PR: [#76736](https://github.com/dotnet/roslyn/pull/76736))
* Initial work to collapse comments at the end of a block (PR: [#76865](https://github.com/dotnet/roslyn/pull/76865))
* Remove explicit recursion in the json detection analyzer (#76764) (PR: [#76764](https://github.com/dotnet/roslyn/pull/76764))
* Consider silly cyclic assignment in scoped variance (#76261) (PR: [#76261](https://github.com/dotnet/roslyn/pull/76261))
* Fix ordering of 'params' vs 'scoped' in metadata as source (#76745) (PR: [#76745](https://github.com/dotnet/roslyn/pull/76745))
* Change partial keyword recommender to better handle partial member syntax (#76744) (PR: [#76744](https://github.com/dotnet/roslyn/pull/76744))
* Ensure unconverted elements are converted when on LHS (#76675) (PR: [#76675](https://github.com/dotnet/roslyn/pull/76675))
* Proffer CssVisualDiagnosticsService brokered service from C# DevKit to C# Extension (#76737) (PR: [#76737](https://github.com/dotnet/roslyn/pull/76737))
* Disable extract class/interface to a new file when unsupported by the workspace. (#76717) (PR: [#76717](https://github.com/dotnet/roslyn/pull/76717))
* Fix issue parsing regex category (#76735) (PR: [#76735](https://github.com/dotnet/roslyn/pull/76735))
* Properly simplify pattern when converting to pattern matching (#76734) (PR: [#76734](https://github.com/dotnet/roslyn/pull/76734))
* Do not lift type parameters in extract method declared within the selected region (#76724) (PR: [#76724](https://github.com/dotnet/roslyn/pull/76724))
* Always use .OriginalDefinition uniformly in the unread-members analyzer (#76698) (PR: [#76698](https://github.com/dotnet/roslyn/pull/76698))
* Adding checks for mutable structs. (#76711) (PR: [#76711](https://github.com/dotnet/roslyn/pull/76711))
* Add option for choosing stdio as the LSP communication channel (#76437) (PR: [#76437](https://github.com/dotnet/roslyn/pull/76437))
* Support organizing imports as part of LSP document formatting (PR: [#76806](https://github.com/dotnet/roslyn/pull/76806))
* Improve collapsing of members followed by pp directives (PR: [#76837](https://github.com/dotnet/roslyn/pull/76837))
* Load razor assembly directly: (PR: [#76808](https://github.com/dotnet/roslyn/pull/76808))
* Special case inlining a collection expr into a spreaded element (PR: [#76823](https://github.com/dotnet/roslyn/pull/76823))
* Do not offer to simplify interpolations when using formattable strings (PR: [#76830](https://github.com/dotnet/roslyn/pull/76830))
* Add support for outlining switch expressions (PR: [#76827](https://github.com/dotnet/roslyn/pull/76827))
* Do no offer to make fields readonly if they are a struct and are written to through an indexer (PR: [#76825](https://github.com/dotnet/roslyn/pull/76825))
* Do not offer to inline a decl into a switch arm when it is referenced outside of it. (PR: [#76822](https://github.com/dotnet/roslyn/pull/76822))
* Fix gen-method generating into top level. (PR: [#76821](https://github.com/dotnet/roslyn/pull/76821))
* Fix 'invert if' refactor to properly enclose #region/#endregion blocks (PR: [#74145](https://github.com/dotnet/roslyn/pull/74145))
* Do not offer use-conditional when it would cause name collisions (PR: [#76807](https://github.com/dotnet/roslyn/pull/76807))
* Remove unnecessary cast in one conditional expression branch, based on the other branch and outer conversion. (PR: [#76798](https://github.com/dotnet/roslyn/pull/76798))
* Convert a return value to return type even if it has errors (PR: [#76699](https://github.com/dotnet/roslyn/pull/76699))
* Add EmbeddedAttribute API for source generators (PR: [#76583](https://github.com/dotnet/roslyn/pull/76583))
* Fix formatting when doing a 'fix all' with 'use auto prop' (PR: [#76791](https://github.com/dotnet/roslyn/pull/76791))
* Initialize naming style preferences when language is added to workspace (PR: [#76795](https://github.com/dotnet/roslyn/pull/76795))
* Support target type completion tags in object creation contexts (PR: [#76786](https://github.com/dotnet/roslyn/pull/76786))
* Fix 'use conditional expression' where it was causing a null-ref warning. (PR: [#76792](https://github.com/dotnet/roslyn/pull/76792))
* Keep comments on an 'else' keyword when converting to conditional expressions. (PR: [#76789](https://github.com/dotnet/roslyn/pull/76789))
* VB: Don't capture conditional access receiver into a temp local during lowering. (PR: [#76712](https://github.com/dotnet/roslyn/pull/76712))
* Update regex parsing to latest .Net core parsing (and diagnostic messages). (PR: [#76269](https://github.com/dotnet/roslyn/pull/76269))
* Forbid pointer types as instance fields in records (PR: [#76588](https://github.com/dotnet/roslyn/pull/76588))
* Field-backed properties: report diagnostic for variable named field declared in accessor (PR: [#76671](https://github.com/dotnet/roslyn/pull/76671))
* Update 'use nameof instead of typeof' to support generic types (PR: [#76780](https://github.com/dotnet/roslyn/pull/76780))
* Add feature to convert from an explicitly typed lambda to an implicitly typed one. (PR: [#76770](https://github.com/dotnet/roslyn/pull/76770))
* Support modifiers with simple lambda parameters. (PR: [#75400](https://github.com/dotnet/roslyn/pull/75400))
* Update Razor to 9.0.0-preview.25064.4 (PR: [#7927](https://github.com/dotnet/vscode-csharp/pull/7927))
* Wire up the UseRoslynTokenizer feature properly (#11386) (PR: [#11386](https://github.com/dotnet/razor/pull/11386))
* New Razor document formatting engine (#11364) (PR: [#11364](https://github.com/dotnet/razor/pull/11364))
* Fix a couple of exceptions encountered when formatting documents with preprocessor directives (#11373) (PR: [#11373](https://github.com/dotnet/razor/pull/11373))
* Allow RazorProjectEngine.Process to be cancelled (#11334) (PR: [#11334](https://github.com/dotnet/razor/pull/11334))
* Further refactoring of Razor tooling project system (#11320) (PR: [#11320](https://github.com/dotnet/razor/pull/11320))

# 2.62.x
* Update Roslyn to 4.14.0-1.25060.2 (PR: [#7916](https://github.com/dotnet/vscode-csharp/pull/7916))
* Support Extracting method with complex flow control cosntructs in them. (PR: [#76686](https://github.com/dotnet/roslyn/pull/76686))
* Classify the langword attribute value in DocComments (PR: [#76678](https://github.com/dotnet/roslyn/pull/76678))
* Fix FAR/rename with method type parameters (PR: [#76652](https://github.com/dotnet/roslyn/pull/76652))
* Fix assembly load when file path contains URI reserved chars (PR: [#76617](https://github.com/dotnet/roslyn/pull/76617))
* Reduce allocations during checksum creation. (PR: [#76524](https://github.com/dotnet/roslyn/pull/76524))
* Bump xamlTools to 17.13.35709.178 (PR: [#7914](https://github.com/dotnet/vscode-csharp/pull/7914))


# 2.61.x
* Update Razor to 9.0.0-preview.25052.3 (PR: [#7904](https://github.com/dotnet/vscode-csharp/pull/7904))
* Offer generate handler for `@bind-XX:after` and `:set` (#11350) (PR: [#11350](https://github.com/dotnet/razor/pull/11350))
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ Follow these steps to build, run, and test the repository:

#### Building

1. Run `npm i` - This command installs the project dependencies.
2. Run `vsts-npm-auth -config .npmrc` - This command will configure your credentials for the next command.
1. Run `npm install -g vsts-npm-auth`, then run `vsts-npm-auth -config .npmrc` - This command will configure your credentials for the next command.
2. Run `npm i` - This command installs the project dependencies.
3. Run `npm i -g gulp` - This command installs Gulp globally.
4. Run `gulp installDependencies` - This command downloads the various dependencies as specified by the version in the [package.json](package.json) file.
5. Run `code .` - This command opens the project in Visual Studio Code.
Expand Down
16 changes: 11 additions & 5 deletions azure-pipelines/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,32 @@ jobs:
env:
SignType: $(signType)

- task: CopyFiles@2
inputs:
SourceFolder: '$(Build.SourcesDirectory)/vsix'
TargetFolder: '$(Build.SourcesDirectory)/Packages/VSIX_$(channel)'

- ${{ if eq(parameters.isOfficial, true) }}:
- task: 1ES.PublishBuildArtifacts@1
condition: succeeded()
displayName: 'Publish VSIXs'
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/vsix'
ArtifactName: 'VSIX_$(channel)'
PathtoPublish: '$(Build.SourcesDirectory)/Packages'
ArtifactName: 'Packages'
- task: 1ES.PublishBuildArtifacts@1
condition: succeededOrFailed()
displayName: 'Publish Signing Logs'
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/out/logs'
ArtifactName: '${{ parameters.platform }} Signing Logs'

- ${{ else }}:
- task: PublishBuildArtifacts@1
condition: succeeded()
displayName: 'Publish VSIXs'
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/vsix'
ArtifactName: 'VSIX_$(channel)'
PathtoPublish: '$(Build.SourcesDirectory)/Packages'
ArtifactName: 'Packages'

- script: npm run test:artifacts
displayName: 'Run artifacts tests'
displayName: 'Run artifacts tests'
18 changes: 8 additions & 10 deletions azure-pipelines/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,18 @@ extends:
name: netcore1espool-internal
image: 1es-ubuntu-2204
os: linux
templateContext:
type: releaseJob
isProduction: true
inputs:
- input: pipelineArtifact
pipeline: officialBuildCI
artifactName: Packages
destinationPath: $(Pipeline.Workspace)
strategy:
runOnce:
deploy:
steps:
- download: 'none'
- task: DownloadPipelineArtifact@2
displayName: '📦 Download artifacts from build pipeline.'
inputs:
buildType: 'specific'
project: 'internal'
definition: 1264
buildVersionToDownload: 'specific'
buildId: '$(resources.pipeline.officialBuildCI.runID)'
branchName: '$(resources.pipeline.officialBuildCI.sourceBranch)'
- template: /azure-pipelines/install-node.yml@self
- pwsh: |
npm install --global @vscode/vsce
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines/test-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
CSharpTests:
npmCommand: 'test:unit' # Restore when integration test are stable: 'test:withoutDevKit'
npmCommand: test:withoutDevKit
DevKitTests:
npmCommand: test:integration:devkit
pool: ${{ parameters.pool }}
Expand Down
Loading

0 comments on commit 442cbe0

Please sign in to comment.