microsoft · qarni · Aug 28, 2024 · May 16, 2024 · May 20, 2024 · May 20, 2024
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
@@ -1413,7 +1413,7 @@ Copyright (c) NevWare21 and contributors
 
 The MIT License (MIT)
 
-    Copyright (c) Microsoft Corporation. All rights reserved.
+Copyright (c) Microsoft Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1542,22 +1542,48 @@ SOFTWARE.
 @microsoft/dynamicproto-js 2.0.3 - MIT
 https://github.com/microsoft/DynamicProto-JS#readme
 
-(c) James Halliday
+Copyright (c) 2022 Nevware21
 Copyright (c) Microsoft Corporation
 Copyright (c) Microsoft and contributors
-Copyright (c) 2010-2013 Christian Johansen
-Copyright (c) 2010-2014 Christian Johansen
-Copyright (c) 2011 Sven Fuchs, Christian Johansen
-Copyright Joyent, Inc. and other Node contributors
-Copyright jQuery Foundation and other contributors
-Copyright 2013 jQuery Foundation, Inc. and other contributors
-Copyright (c) 2010-2014, Christian Johansen, christian@cjohansen.no
-Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
-Copyright 2006 Google Inc. https://code.google.com/p/google-diff-match-patch
+
+The MIT License (MIT)
+
+Copyright (c) Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+---------------------------------------------------------
+
+---------------------------------------------------------
+
+@nevware21/ts-async 0.5.1 - MIT
+https://github.com/nevware21/ts-async
+
+Copyright (c) 2022 Nevware21
+Copyright (c) 2023 Nevware21
+Copyright (c) 2024 Nevware21
+Copyright (c) NevWare21 and contributors
 
 MIT License
 
-    Copyright (c) Microsoft Corporation.
+Copyright (c) 2022 Nevware21
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/i18n/chs/src/preset.i18n.json b/i18n/chs/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "循环在工作流预设 {0} 中继承",
 	"build.preset.not.found.full": "找不到名称为 {0} 的生成预设",
 	"build.preset.not.found": "找不到生成预设",
+	"configure.preset.not.found.full": "找不到名为 {0} 的配置预设",
+	"configure.preset.not.found": "找不到配置预设",
 	"test.preset.not.found.full": "找不到名称为 {0} 的测试预设",
 	"test.preset.not.found": "找不到测试预设",
 	"package.preset.not.found.full": "找不名称为 {0} 的包预设",

diff --git a/i18n/cht/src/preset.i18n.json b/i18n/cht/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "循環在工作流程預設 {0} 中繼承",
 	"build.preset.not.found.full": "找不到名稱為 {0} 的建置預設",
 	"build.preset.not.found": "找不到建置預設",
+	"configure.preset.not.found.full": "找不到名稱為 {0} 的設定預設",
+	"configure.preset.not.found": "找不到設定預設",
 	"test.preset.not.found.full": "找不到名稱為 {0} 的測試預設",
 	"test.preset.not.found": "找不到測試預設",
 	"package.preset.not.found.full": "找不到名為 {0} 的封裝預設",

diff --git a/i18n/csy/src/preset.i18n.json b/i18n/csy/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "Cyklické dědění v předvolbě pracovního postupu {0}",
 	"build.preset.not.found.full": "Nepovedlo se najít předvolbu sestavení s názvem {0}.",
 	"build.preset.not.found": "Nepovedlo se najít předvolbu sestavení.",
+	"configure.preset.not.found.full": "Nepovedlo se najít předvolbu konfigurace s názvem {0}.",
+	"configure.preset.not.found": "Nepovedlo se najít předvolbu konfigurace.",
 	"test.preset.not.found.full": "Nepovedlo se najít předvolbu testování s názvem {0}.",
 	"test.preset.not.found": "Nepovedlo se najít předvolbu testování.",
 	"package.preset.not.found.full": "Nepovedlo se najít předvolbu balíčku s názvem {0}.",

diff --git a/i18n/deu/src/preset.i18n.json b/i18n/deu/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "Kreisförmige Erbvorgänge in Workflowvoreinstellung {0}",
 	"build.preset.not.found.full": "Die Buildvoreinstellung mit dem Namen {0} wurde nicht gefunden",
 	"build.preset.not.found": "Die Buildvoreinstellung konnte nicht gefunden werden",
+	"configure.preset.not.found.full": "Die Konfigurationsvoreinstellung mit dem Namen {0} wurde nicht gefunden",
+	"configure.preset.not.found": "Die Konfigurationsvoreinstellung wurde nicht gefunden",
 	"test.preset.not.found.full": "Die Testvoreinstellung mit dem Namen {0} wurde nicht gefunden",
 	"test.preset.not.found": "Die Voreinstellung konnte nicht gefunden werden",
 	"package.preset.not.found.full": "Die Paketvoreinstellung mit dem Namen {0} wurde nicht gefunden",

diff --git a/i18n/esn/src/preset.i18n.json b/i18n/esn/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "Circular hereda en {0}preestablecidos de flujo de trabajo",
 	"build.preset.not.found.full": "No se ha encontrado la compilación preestablecida con el nombre {0}",
 	"build.preset.not.found": "No se encontró el valor preestablecido de compilación",
+	"configure.preset.not.found.full": "No se encontró la configuración preestablecida con el nombre {0}",
+	"configure.preset.not.found": "No se pudo encontrar el valor preestablecido de configuración",
 	"test.preset.not.found.full": "No ha encontrado se la prueba preestablecida con el nombre {0}.",
 	"test.preset.not.found": "No se pudo encontrar el valor preestablecido de prueba",
 	"package.preset.not.found.full": "No se encontró el valor preestablecido del paquete con el nombre {0}",

diff --git a/i18n/fra/src/preset.i18n.json b/i18n/fra/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "Héritages circulaires dans la présélection de workflow {0}",
 	"build.preset.not.found.full": "Impossible de trouver une préselection de build avec le nom {0}",
 	"build.preset.not.found": "Impossible de trouver une préselection de build",
+	"configure.preset.not.found.full": "Présélection de la configuration introuvable avec le nom {0}",
+	"configure.preset.not.found": "Présélection de la configuration introuvable",
 	"test.preset.not.found.full": "Impossible de trouver une présélection de test nommée {0}",
 	"test.preset.not.found": "Impossible de trouver la présélection de test",
 	"package.preset.not.found.full": "Impossible de trouver la présélection de package nommée {0}",

diff --git a/i18n/ita/src/preset.i18n.json b/i18n/ita/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "Ereditarietà circolari nel set di impostazioni del flusso di lavoro {0}",
 	"build.preset.not.found.full": "Non è stato possibile trovare il set di impostazioni di compilazione denominato {0}",
 	"build.preset.not.found": "Non è stato possibile trovare il set di impostazioni di compilazione",
+	"configure.preset.not.found.full": "Non è stato possibile trovare il set di impostazioni di configurazione denominato {0}",
+	"configure.preset.not.found": "Non è stato possibile trovare il set di impostazioni di configurazione",
 	"test.preset.not.found.full": "Non è stato possibile trovare il set di impostazioni di test denominato {0}",
 	"test.preset.not.found": "Non è stato possibile trovare il set di impostazioni di test",
 	"package.preset.not.found.full": "Non è possibile trovare il set di impostazioni del pacchetto con il nome {0}",

diff --git a/i18n/jpn/src/preset.i18n.json b/i18n/jpn/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "ワークフロー プリセット {0} での循環継承",
 	"build.preset.not.found.full": "名前が {0} のビルドの事前設定が見つかりませんでした",
 	"build.preset.not.found": "ビルド プリセットが見つかりませんでした",
+	"configure.preset.not.found.full": "名前が {0} の構成の事前設定を見つけることができませんでした",
+	"configure.preset.not.found": "構成プリセットが見つかりませんでした",
 	"test.preset.not.found.full": "名前が {0} のテストの事前設定が見つかりませんでした",
 	"test.preset.not.found": "テスト プリセットが見つかりませんでした。",
 	"package.preset.not.found.full": "名前が {0} のパッケージ プリセットが見つかりませんでした",

diff --git a/i18n/kor/src/preset.i18n.json b/i18n/kor/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "워크플로 사전 설정 {0}의 순환 상속",
 	"build.preset.not.found.full": "이름이 {0}인 빌드 사전 설정을 찾을 수 없음",
 	"build.preset.not.found": "빌드 사전 설정을 찾을 수 없습니다.",
+	"configure.preset.not.found.full": "이름이 {0}인 구성 사전 설정을 찾을 수 없음",
+	"configure.preset.not.found": "구성 미리 설정을 찾을 수 없습니다.",
 	"test.preset.not.found.full": "이름이 {0}인 테스트 사전 설정을 찾을 수 없음",
 	"test.preset.not.found": "테스트 사전 설정을 찾을 수 없습니다.",
 	"package.preset.not.found.full": "이름이 {0}인 패키지 사전 설정을 찾을 수 없음",

diff --git a/i18n/plk/src/preset.i18n.json b/i18n/plk/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "Cykliczne dziedziczenia w ustawieniu wstępnym przepływu pracy {0}",
 	"build.preset.not.found.full": "Nie można odnaleźć predefiniowanej kompilacji o nazwie {0}",
 	"build.preset.not.found": "Nie można odnaleźć ustawienia wstępnego kompilacji",
+	"configure.preset.not.found.full": "Nie można odnaleźć predefiniowanej konfiguracji o nazwie {0}",
+	"configure.preset.not.found": "Nie można odnaleźć ustawienia wstępnego konfiguracji",
 	"test.preset.not.found.full": "Nie można odnaleźć predefiniowanego testu o nazwie {0}",
 	"test.preset.not.found": "Nie można odnaleźć ustawienia wstępnego testu",
 	"package.preset.not.found.full": "Nie można odnaleźć ustawienia wstępnego pakietu o nazwie {0}",

diff --git a/i18n/ptb/src/preset.i18n.json b/i18n/ptb/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "Heranças circulares na predefinição de fluxo de trabalho {0}",
 	"build.preset.not.found.full": "Não foi possível encontrar a predefinição de compilação com o nome {0}",
 	"build.preset.not.found": "Não foi possível localizar a predefinição de build",
+	"configure.preset.not.found.full": "Não foi possível encontrar a predefinição de configuração com o nome {0}",
+	"configure.preset.not.found": "Não foi possível encontrar a predefinição de configuração",
 	"test.preset.not.found.full": "Não foi possível encontrar a predefinição de teste com o nome {0}",
 	"test.preset.not.found": "Não foi possível localizar a predefinição de teste",
 	"package.preset.not.found.full": "Não foi possível encontrar a predefinição de pacote com o nome {0}",

diff --git a/i18n/rus/src/preset.i18n.json b/i18n/rus/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "Циклические наследования в предустановке рабочего процесса {0}",
 	"build.preset.not.found.full": "Не удалось найти предустановку сборки с именем {0}",
 	"build.preset.not.found": "Не удалось найти предустановку сборки",
+	"configure.preset.not.found.full": "Не удалось найти предустановку конфигурации с именем {0}",
+	"configure.preset.not.found": "Не удалось найти предустановку конфигурации",
 	"test.preset.not.found.full": "Не удалось найти предустановку теста с именем {0}",
 	"test.preset.not.found": "Не удалось найти предустановку теста",
 	"package.preset.not.found.full": "Не удалось найти предустановку пакета с именем {0}",

diff --git a/i18n/trk/src/preset.i18n.json b/i18n/trk/src/preset.i18n.json
@@ -38,6 +38,8 @@
 	"circular.inherits.in.workflow.preset": "İş akışı ön ayarında döngüsel devralmalar {0}",
 	"build.preset.not.found.full": "{0} adlı derleme ön ayarı bulunamadı",
 	"build.preset.not.found": "Derleme ön ayarı bulunamadı",
+	"configure.preset.not.found.full": "Adı {0} olan yapılandırma ön ayarı bulunamadı",
+	"configure.preset.not.found": "Yapılandırma ön ayarı bulunamadı",
 	"test.preset.not.found.full": "{0} adlı test ön ayarı bulunamadı",
 	"test.preset.not.found": "Test ön ayarı bulunamadı",
 	"package.preset.not.found.full": "{0} adlı paket ön ayarı bulunamadı",

diff --git a/src/preset.ts b/src/preset.ts
@@ -1613,7 +1613,10 @@ async function getBuildPresetInheritsHelper(folder: string, preset: BuildPreset,
 
     // Expand configure preset. Evaluate this after inherits since it may come from parents
     if (preset.configurePreset) {
-        const expandedConfigurePreset = getPresetByName(configurePresets(folder), preset.configurePreset);
+        let expandedConfigurePreset = getPresetByName(configurePresets(folder), preset.configurePreset);
+        if (!expandedConfigurePreset && allowUserPreset) {
+            expandedConfigurePreset = getPresetByName(userConfigurePresets(folder), preset.configurePreset);
+        }
 
         if (!expandedConfigurePreset) {
             log.error(localize('configure.preset.not.found.full', 'Could not find configure preset with name {0}', preset.configurePreset));
@@ -1786,7 +1789,11 @@ async function getTestPresetInheritsHelper(folder: string, preset: TestPreset, w
 
     // Expand configure preset. Evaluate this after inherits since it may come from parents
     if (preset.configurePreset) {
-        const expandedConfigurePreset = getPresetByName(configurePresets(folder), preset.configurePreset);
+        let expandedConfigurePreset = getPresetByName(configurePresets(folder), preset.configurePreset);
+        if (!expandedConfigurePreset && allowUserPreset) {
+            expandedConfigurePreset = getPresetByName(userConfigurePresets(folder), preset.configurePreset);
+        }
+
         if (!expandedConfigurePreset) {
             log.error(localize('configure.preset.not.found.full', 'Could not find configure preset with name {0}', preset.configurePreset));
             errorHandler?.tempErrorList.push([localize('configure.preset.not.found', 'Could not find configure preset'), preset.configurePreset]);
@@ -1996,7 +2003,11 @@ async function getPackagePresetInheritsHelper(folder: string, preset: PackagePre
 
     // Expand configure preset. Evaluate this after inherits since it may come from parents
     if (preset.configurePreset) {
-        const expandedConfigurePreset = getPresetByName(configurePresets(folder), preset.configurePreset);
+        let expandedConfigurePreset = getPresetByName(configurePresets(folder), preset.configurePreset);
+        if (!expandedConfigurePreset && allowUserPreset) {
+            expandedConfigurePreset = getPresetByName(userConfigurePresets(folder), preset.configurePreset);
+        }
+
         if (!expandedConfigurePreset) {
             log.error(localize('configure.preset.not.found.full', 'Could not find configure preset with name {0}', preset.configurePreset));
             errorHandler?.tempErrorList.push([localize('configure.preset.not.found', 'Could not find configure preset'), preset.configurePreset]);