Skip to content

Commit cb410c3

Browse files
Merge pull request che-incubator#539 from RomanNikitenko/disable-prefer-pre-releases
fix: Always install release version of extensions
2 parents f18c505 + 6d4c807 commit cb410c3

4 files changed

Lines changed: 15 additions & 1 deletion

File tree

.rebase/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
44

5+
#### @RomanNikitenko
6+
https://github.com/che-incubator/che-code/pull/539
7+
8+
- code/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
9+
---
10+
511
#### @RomanNikitenko
612
https://github.com/che-incubator/che-code/pull/557
713

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[
2+
{
3+
"from": "this.preferPreReleases = this.productService.quality !== 'stable';",
4+
"by": "this.preferPreReleases = false;"
5+
}
6+
]

code/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export abstract class CommontExtensionManagementService extends Disposable imple
6969
@IAllowedExtensionsService protected readonly allowedExtensionsService: IAllowedExtensionsService,
7070
) {
7171
super();
72-
this.preferPreReleases = this.productService.quality !== 'stable';
72+
this.preferPreReleases = false;
7373
}
7474

7575
async canInstall(extension: IGalleryExtension): Promise<true | IMarkdownString> {

rebase.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,8 @@ resolve_conflicts() {
482482
apply_changes "$conflictingFile"
483483
elif [[ "$conflictingFile" == "code/src/vs/platform/extensionManagement/node/extensionManagementService.ts" ]]; then
484484
apply_changes "$conflictingFile"
485+
elif [[ "$conflictingFile" == "code/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts" ]]; then
486+
apply_changes "$conflictingFile"
485487
elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts" ]]; then
486488
apply_multi_line_replace "$conflictingFile"
487489
else

0 commit comments

Comments
 (0)