2
0
Эх сурвалжийг харах

Fix custom gallery pacht for 1.56

Atesca 4 жил өмнө
parent
commit
656a02b50f

+ 12 - 11
patches/custom-gallery.patch

@@ -1,16 +1,16 @@
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index 251ed36..8065c6f 100644
+index d79c8a3..7a25774 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
-@@ -8,6 +8,7 @@ import { isWeb } from 'vs/base/common/platform';
- import { env } from 'vs/base/common/process';
+@@ -9,6 +9,7 @@ import { env } from 'vs/base/common/process';
  import { dirname, joinPath } from 'vs/base/common/resources';
- import { IProductConfiguration } from 'vs/platform/product/common/productService';
+ import { IProductConfiguration } from 'vs/base/common/product';
+ import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
 +import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
  
  let product: IProductConfiguration;
  
-@@ -49,6 +50,29 @@ else {
+@@ -31,6 +32,29 @@ else if (typeof require?.__$__nodeRequire === 'function') {
  	product = require.__$__nodeRequire(joinPath(rootPath, 'product.json').fsPath);
  	const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string; };
  
@@ -40,7 +40,7 @@ index 251ed36..8065c6f 100644
  	// Running out of sources
  	if (env['VSCODE_DEV']) {
  		Object.assign(product, {
-@@ -58,6 +82,19 @@ else {
+@@ -40,6 +64,19 @@ else if (typeof require?.__$__nodeRequire === 'function') {
  		});
  	}
  
@@ -60,11 +60,12 @@ index 251ed36..8065c6f 100644
  	Object.assign(product, {
  		version: pkg.version
  	});
-diff --git a/src/vs/platform/product/common/productService.ts b/src/vs/platform/product/common/productService.ts
-index 34acc14..d3a2764 100644
---- a/src/vs/platform/product/common/productService.ts
-+++ b/src/vs/platform/product/common/productService.ts
-@@ -67,6 +67,7 @@ export interface IProductConfiguration {
+
+diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
+index 129b8de..fadb99a 100644
+--- a/src/vs/base/common/product.ts
++++ b/src/vs/base/common/product.ts
+@@ -62,6 +62,7 @@ export interface IProductConfiguration {
  
  	readonly extensionsGallery?: {
  		readonly serviceUrl: string;