diff --git a/insider.json b/insider.json index 5668f54..6352d78 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.74.0", - "commit": "9d5741f01a67beea273121615b2d015fc298d9ea" + "commit": "ef415578d1b1019db585718968a303eeca4b8979" } diff --git a/patches/custom-gallery.patch b/patches/custom-gallery.patch index ecbdca4..93abe1c 100644 --- a/patches/custom-gallery.patch +++ b/patches/custom-gallery.patch @@ -1,10 +1,12 @@ diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts -index bceda01..174c766 100644 +index 3f50bef..2b4e8c2 100644 --- a/src/vs/platform/product/common/product.ts +++ b/src/vs/platform/product/common/product.ts -@@ -6,3 +6,3 @@ - import { FileAccess } from 'vs/base/common/network'; +@@ -5,4 +5,4 @@ + +-import { FileAccess } from 'vs/base/common/network'; -import { globals } from 'vs/base/common/platform'; ++import { AppResourcePath, FileAccess } from 'vs/base/common/network'; +import { globals, isWindows } from 'vs/base/common/platform'; import { env } from 'vs/base/common/process'; @@ -11,2 +11,3 @@ import { dirname, joinPath } from 'vs/base/common/resources'; @@ -46,7 +48,7 @@ index bceda01..174c766 100644 + const userDataPath = getUserDataPath({} as any, product.nameShort); + const userProductPath = isWindows ? `file:///${userDataPath}/product.json` : `file://${userDataPath}/product.json`; + -+ const userProduct = require.__$__nodeRequire(FileAccess.asFileUri(userProductPath, require).fsPath); ++ const userProduct = require.__$__nodeRequire(FileAccess.asFileUri(userProductPath as AppResourcePath).fsPath); + + product = merge(product, userProduct); + } catch (ex) { diff --git a/undo_telemetry.sh b/undo_telemetry.sh index 93076d7..2a3e1d7 100755 --- a/undo_telemetry.sh +++ b/undo_telemetry.sh @@ -14,12 +14,12 @@ REPLACEMENT="s|//[^/]+\.data\.microsoft\.com|//0\.0\.0\.0|g" if is_gnu_sed; then replace_with_debug () { - echo "found: ${2} (`date`)" + echo "found: ${2}" sed -i -E "${1}" "${2}" } else replace_with_debug () { - echo "found: ${2} (`date`)" + echo "found: ${2}" sed -i '' -E "${1}" "${2}" } fi