Skip to content

Commit 187c024

Browse files
authored
Merge pull request #7588 from dotnet/merge/prerelease-to-main
[automated] Merge branch 'prerelease' => 'main'
2 parents 745b1a3 + 26cafe1 commit 187c024

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

CHANGELOG.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
* Update Razor to 9.0.0-preview.24467.1
1010
* Fix LF line-ending auto format bug (PR: [#10802](https://github.com/dotnet/razor/pull/10802))
1111
* Bumped xamltools to 17.12.35319.159 (PR: [#7583](https://github.com/dotnet/vscode-csharp/pull/7583))
12-
* Bump xamlTools to 17.12.35318.29 (PR: [#7577](https://github.com/OmniSharp/omnisharp-vscode/pull/7577))
13-
* Register Copilot `relatedFilesProvider` for C# (PR: [#7578](https://github.com/OmniSharp/omnisharp-vscode/pull/7578))
14-
12+
* Bump xamlTools to 17.12.35318.29 (PR: [#7577](https://github.com/dotnet/vscode-csharp/pull/7577))
13+
* Register Copilot `relatedFilesProvider` for C# (PR: [#7578](https://github.com/dotnet/vscode-csharp/pull/7578))
14+
* Update Roslyn to 4.12.0-3.24470.4 (PR: [#7589](https://github.com/dotnet/vscode-csharp/pull/7589))
15+
* Remove ResultId from RelatedDocumentsHandler (PR: [#75176](https://github.com/dotnet/roslyn/pull/75176))
16+
* Do not attempt to report EnC diagnostics for non-host workspaces (PR: [#75138](https://github.com/dotnet/roslyn/pull/75138))
17+
* Allow Razor to get diagnostics for cohosting (PR: [#75102](https://github.com/dotnet/roslyn/pull/75102))
18+
Í
1519
# 2.48.x
1620
* Add signing support to VSIX (PR: [#7490](https://github.com/dotnet/vscode-csharp/pull/7490))
1721
* Update Debugger to v2.47.0 (PR: [#7547](https://github.com/dotnet/vscode-csharp/pull/7547))

azure-pipelines/build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ jobs:
2828
parameters:
2929
versionNumberOverride: ${{ parameters.versionNumberOverride }}
3030

31+
- task: UsePythonVersion@0
32+
displayName: 'Use Python 3.11'
33+
inputs:
34+
versionSpec: 3.11
35+
3136
# If we're in an official build, install the signing plugin
3237
- ${{ if eq(parameters.isOfficial, true) }}:
3338
- task: MicroBuildSigningPlugin@4
@@ -67,7 +72,7 @@ jobs:
6772
PathtoPublish: '$(Build.SourcesDirectory)/vsix'
6873
ArtifactName: 'VSIX_$(channel)'
6974
- task: 1ES.PublishBuildArtifacts@1
70-
condition: succeeded()
75+
condition: succeededOrFailed()
7176
displayName: 'Publish Signing Logs'
7277
inputs:
7378
PathtoPublish: '$(Build.SourcesDirectory)/out/logs'

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
}
3838
},
3939
"defaults": {
40-
"roslyn": "4.12.0-3.24463.6",
40+
"roslyn": "4.12.0-3.24470.4",
4141
"omniSharp": "1.39.11",
4242
"razor": "9.0.0-preview.24467.1",
4343
"razorOmnisharp": "7.0.0-preview.23363.1",
@@ -5592,4 +5592,4 @@
55925592
}
55935593
}
55945594
}
5595-
}
5595+
}

0 commit comments

Comments
 (0)