From c61e760c8d486d27aae2a115e5c586f87e3c3159 Mon Sep 17 00:00:00 2001 From: Jordi Ramos Date: Wed, 7 Feb 2024 13:46:59 -0800 Subject: [PATCH 01/25] adding lower case razorComponentAttribute to package.json - fixing the capitalization in consistency problem in razorComponentAttribute by first adding a transition state of adding the correct one in without deleting the old one. - tested with the commit number 4d6dc76ec18198d065dd5332fb92ba93e16f6964 of the razor repo and the coloring of razor component attribute works --- package.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index bb9a7b889..e615246e0 100644 --- a/package.json +++ b/package.json @@ -4891,6 +4891,10 @@ "id": "RazorComponentAttribute", "description": "A Razor component attribute" }, + { + "id": "razorComponentAttribute", + "description": "A Razor component attribute" + }, { "id": "razorTagHelperElement", "description": "A Razor TagHelper Element" @@ -5205,6 +5209,9 @@ "RazorComponentAttribute": [ "entity.name.class.attribute.component" ], + "razorComponentAttribute": [ + "entity.name.class.attribute.component" + ], "razorTagHelperElement": [ "entity.name.class.element.taghelper" ], @@ -5691,4 +5698,4 @@ } ] } -} \ No newline at end of file +} From 2e4ae374755a5d43de9d27435acbb40b642c9eeb Mon Sep 17 00:00:00 2001 From: Jordi Ramos Date: Wed, 7 Feb 2024 15:58:08 -0800 Subject: [PATCH 02/25] delete the uppercase of razorComponentAttribute in package.json - delete the old uppercase of razorComponentAttribute in package.json so that the capitalization is consistent. --- package.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package.json b/package.json index e615246e0..be663d215 100644 --- a/package.json +++ b/package.json @@ -4887,10 +4887,6 @@ "id": "razorComponentElement", "description": "A Razor component element" }, - { - "id": "RazorComponentAttribute", - "description": "A Razor component attribute" - }, { "id": "razorComponentAttribute", "description": "A Razor component attribute" @@ -5206,9 +5202,6 @@ "razorComponentElement": [ "entity.name.class.element.component" ], - "RazorComponentAttribute": [ - "entity.name.class.attribute.component" - ], "razorComponentAttribute": [ "entity.name.class.attribute.component" ], From 9fcd3533bb26642dee06297b26807d879c1d2d0a Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Mon, 4 Mar 2024 17:41:29 +0000 Subject: [PATCH 03/25] Localization result of 984a83f5bb62e83b623875649332f60e4fa10047. --- package.nls.cs.json | 2 +- package.nls.ko.json | 2 +- package.nls.pl.json | 2 +- package.nls.tr.json | 2 +- package.nls.zh-cn.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.nls.cs.json b/package.nls.cs.json index 93d5d6015..24568bddf 100644 --- a/package.nls.cs.json +++ b/package.nls.cs.json @@ -187,7 +187,7 @@ "generateOptionsSchema.symbolOptions.moduleFilter.description": "Poskytuje možnosti pro kontrolu, pro které moduly (soubory DLL) se ladicí program pokusí načíst symboly (soubory. pdb).", "generateOptionsSchema.symbolOptions.moduleFilter.excludedModules.description": "Pole modulů, pro které by ladicí program neměl načítat symboly. Zástupné znaky (například: MyCompany. *.DLL) jsou podporovány.\r\n\r\nTato vlastnost je ignorována, pokud není „mode“ nastaven na hodnotu „loadAllButExcluded“.", "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description": "Pokud má hodnotu true, u libovolného modulu, který není v poli „includedModules“, bude ladicí program stále provádět kontrolu vedle samotného modulu a spouštěcího souboru, ale nebude kontrolovat cesty v seznamu hledání symbolů. Tato možnost je standardně nastavena na hodnotu true.\r\n\r\nTato vlastnost je ignorována, pokud není „mode“ nastaven na hodnotu „loadOnlyIncluded“.", - "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "If true, for any module NOT in the 'includedModules' array, the debugger will attempt to download symbols when it detects symbols are needed, such as when trying to step into the module. This option defaults to 'true'.\r\n\r\nThis property is ignored unless 'mode' is set to 'loadOnlyIncluded'.", + "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "Pokud je true, pokusí se ladicí program pro jakýkoli modul, který NENÍ obsažen v poli includedModules, stáhnout symboly, jakmile zjistí, že jsou symboly potřeba, například při pokusu o krokování s vnořením do modulu. Výchozí hodnota této možnosti je true.\r\n\r\nPokud není možnost mode nastavena na loadOnlyIncluded, je tato vlastnost ignorována.", "generateOptionsSchema.symbolOptions.moduleFilter.includedModules.description": "Pole modulů, pro které má ladicí program načíst symboly. Zástupné znaky (například: MyCompany. *.DLL) jsou podporovány.\r\n\r\nTato vlastnost je ignorována, pokud není „mode“ nastaven na hodnotu „loadOnlyIncluded“.", "generateOptionsSchema.symbolOptions.moduleFilter.mode.description": "Určuje, v jakém ze dvou základních operačních režimů pracuje filtr modulu.", "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription": "Načte symboly pro všechny moduly, pokud není modul v poli „excludedModules“.", diff --git a/package.nls.ko.json b/package.nls.ko.json index 4bd2967df..e29b5fd39 100644 --- a/package.nls.ko.json +++ b/package.nls.ko.json @@ -187,7 +187,7 @@ "generateOptionsSchema.symbolOptions.moduleFilter.description": "디버거에서 기호(.pdb 파일)를 로드하려고 시도할 모듈(.dll 파일)을 제어하는 옵션을 제공합니다.", "generateOptionsSchema.symbolOptions.moduleFilter.excludedModules.description": "디버거에서 기호를 로드하지 않아야 하는 모듈의 배열입니다. 와일드카드(예: MyCompany.*.dll)가 지원됩니다.\r\n\r\n'모드'가 'loadAllButExcluded'로 설정되어 있지 않으면 이 속성은 무시됩니다.", "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description": "True 이면 'includedModules' 배열에 없는 모듈에 대해 디버거는 모듈 자체 및 시작 실행 파일 옆을 계속 확인하지만 기호 검색 목록의 경로는 확인하지 않습니다. 이 옵션의 기본값은 'true'입니다.\r\n\r\n'모드'가 'loadOnlyIncluded'로 설정되어 있지 않으면 이 속성은 무시됩니다.", - "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "If true, for any module NOT in the 'includedModules' array, the debugger will attempt to download symbols when it detects symbols are needed, such as when trying to step into the module. This option defaults to 'true'.\r\n\r\nThis property is ignored unless 'mode' is set to 'loadOnlyIncluded'.", + "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "true인 경우 'includedModules' 배열에 없는 모듈의 경우 디버거는 모듈을 한 단계씩 실행하려고 할 때와 같이 기호가 필요한 경우 기호를 다운로드하려고 시도합니다. 이 옵션의 기본값은 'true'입니다.\r\n\r\n'mode'가 'loadOnlyIncluded'로 설정되어 있지 않으면 이 속성은 무시됩니다.", "generateOptionsSchema.symbolOptions.moduleFilter.includedModules.description": "디버거에서 기호를 로드해야 하는 모듈의 배열입니다. 와일드카드(예: MyCompany.*.dll)가 지원됩니다.\r\n\r\n'모드'가 'loadOnlyIncluded'로 설정되어 있지 않으면 이 속성은 무시됩니다.", "generateOptionsSchema.symbolOptions.moduleFilter.mode.description": "두 가지 기본 운영 모드 중 모듈 필터가 작동하는 모드를 제어합니다.", "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription": "모듈이 'excludedModules' 배열에 있지 않으면 모든 모듈에 대한 기호를 로드합니다.", diff --git a/package.nls.pl.json b/package.nls.pl.json index 108d66df5..2d135dac7 100644 --- a/package.nls.pl.json +++ b/package.nls.pl.json @@ -187,7 +187,7 @@ "generateOptionsSchema.symbolOptions.moduleFilter.description": "Udostępnia opcje umożliwiające kontrolowanie modułów (plików DLL), dla których debuger będzie próbował załadować symbole (pliki PDB).", "generateOptionsSchema.symbolOptions.moduleFilter.excludedModules.description": "Tablica modułów, dla których debuger NIE powinien ładować symboli. Symbole wieloznaczne (przykład: MojaFirma.*.dll) są obsługiwane.\r\n\r\nTa właściwość jest ignorowana, chyba że właściwość „mode” jest ustawiona na wartość „loadAllButExcluded”.", "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description": "Jeśli ma wartość true, w przypadku każdego modułu NIE BĘDĄCEGO w tablicy „includedModules” debuger będzie nadal sprawdzał obok modułu i uruchamianego pliku wykonywalnego, ale nie będzie sprawdzał ścieżek na liście wyszukiwania symboli. Ta opcja ma wartość domyślną „true”.\r\n\r\nTa właściwość jest ignorowana, chyba że właściwość „mode” jest ustawiona na wartość „loadOnlyIncluded”.", - "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "If true, for any module NOT in the 'includedModules' array, the debugger will attempt to download symbols when it detects symbols are needed, such as when trying to step into the module. This option defaults to 'true'.\r\n\r\nThis property is ignored unless 'mode' is set to 'loadOnlyIncluded'.", + "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "Jeśli wartość jest równa true, w przypadku dowolnego modułu NOT w tablicy „includedModules” debuger podejmie próbę pobrania symboli, gdy wykryje, że są potrzebne symbole, na przykład podczas próby wejścia do modułu. Ta opcja domyślnie ma wartość „true”.\r\n\r\nTa właściwość jest ignorowana, chyba że właściwość „mode” jest ustawiona na wartość „loadOnlyIncluded”.", "generateOptionsSchema.symbolOptions.moduleFilter.includedModules.description": "Tablica modułów, dla których debuger powinien ładować symbole. Symbole wieloznaczne (przykład: MojaFirma.*.dll) są obsługiwane.\r\n\r\nTa właściwość jest ignorowana, chyba że właściwość „mode” jest ustawiona na wartość „loadOnlyIncluded”.", "generateOptionsSchema.symbolOptions.moduleFilter.mode.description": "Steruje dwoma podstawowymi trybami operacyjnymi, w których działa filtr modułu.", "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription": "Załaduj symbole dla wszystkich modułów, jeśli moduł nie znajduje się w tablicy „excludedModules”.", diff --git a/package.nls.tr.json b/package.nls.tr.json index 50783021e..83046d08c 100644 --- a/package.nls.tr.json +++ b/package.nls.tr.json @@ -187,7 +187,7 @@ "generateOptionsSchema.symbolOptions.moduleFilter.description": "Hata ayıklayıcısının simgeleri (.pdb dosyaları) yüklemeye çalışacağı modülü (.dll dosyaları) denetlemeye yönelik seçenekleri sağlar.", "generateOptionsSchema.symbolOptions.moduleFilter.excludedModules.description": "Hata ayıklayıcısının, sembolleri YÜKLEMEMESİ gereken modül dizisi. Joker karakterler (ör. MyCompany.*.dll) desteklenir.\r\n\r\n'Mode' değeri 'loadAllButExcluded' olarak ayarlanmadıkça bu özellik yoksayılır.", "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description": "True ise hata ayıklayıcısı, 'includedModules' dizisinde OLMAYAN herhangi bir modül için modülün ve başlatılan yürütülebilir dosyanın yanında denetlemeye devam eder ancak sembol arama listesindeki yolları denetlemez.\r\n\r\nBu seçenek varsayılan olarak 'true' şeklinde ayarlanır. 'Mode', 'loadOnlyIncluded' olarak ayarlanmadıkça bu özellik yoksayılır.", - "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "If true, for any module NOT in the 'includedModules' array, the debugger will attempt to download symbols when it detects symbols are needed, such as when trying to step into the module. This option defaults to 'true'.\r\n\r\nThis property is ignored unless 'mode' is set to 'loadOnlyIncluded'.", + "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "Doğruysa, 'includedModules' dizisinde OLMAYAN herhangi bir modül için hata ayıklayıcı, modüle adım atmaya çalışırken olduğu gibi sembollerin gerekli olduğunu algıladığında sembolleri indirmeye çalışacaktır. Bu seçenek varsayılan olarak 'true'dur.\r\n\r\n'mode' değeri 'loadOnlyIncluded' olarak ayarlanmadıkça bu özellik yoksayılır.", "generateOptionsSchema.symbolOptions.moduleFilter.includedModules.description": "Hata ayıklayıcısının, sembolleri yüklemesi gereken modül dizisi. Joker karakterler (ör. MyCompany.*.dll) desteklenir.\r\n\r\n'Mode' değeri 'loadOnlyIncluded' olarak ayarlanmadıkça bu özellik yoksayılır.", "generateOptionsSchema.symbolOptions.moduleFilter.mode.description": "Modül filtresinin iki temel işletim modundan hangisinde çalışacağını denetler.", "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription": "Modül 'excludedModules' dizisinde değilse tüm modüllerin sembollerini yükleyin.", diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json index bea1820bb..902c255b2 100644 --- a/package.nls.zh-cn.json +++ b/package.nls.zh-cn.json @@ -187,7 +187,7 @@ "generateOptionsSchema.symbolOptions.moduleFilter.description": "提供选项来控制调试程序将尝试为哪些模块(.dll 文件)加载符号(.pdb 文件)。", "generateOptionsSchema.symbolOptions.moduleFilter.excludedModules.description": "调试程序不得为其加载符号的模块数组。支持通配符(例如: MyCompany.*.dll)。\r\n\r\n会忽略此属性，除非“模式”设置为 \"loadAllButExcluded\"。", "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsNextToModules.description": "如果为 true，则对于未在 \"includedModules\" 数组中的任何模块，调试程序将在模块本身和启动可执行文件旁边进行检查，但它将不检查符号搜索列表上的路径。此选项默认为 \"true\"\r\n\r\n会忽略此属性，除非“模式”设置为 \"loadOnlyIncluded\"。", - "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "If true, for any module NOT in the 'includedModules' array, the debugger will attempt to download symbols when it detects symbols are needed, such as when trying to step into the module. This option defaults to 'true'.\r\n\r\nThis property is ignored unless 'mode' is set to 'loadOnlyIncluded'.", + "generateOptionsSchema.symbolOptions.moduleFilter.includeSymbolsOnDemand.description": "如果为 true，则对于 \"includedModules\" 数组中没有的任何模块，调试程序将在检测到需要符号时(例如尝试单步执行模块时)尝试下载这些符号。此选项默认为 \"true\"。\r\n\r\n除非将 \"mode\" 设置为 \"loadOnlyIncluded\"，否则将忽略此属性。", "generateOptionsSchema.symbolOptions.moduleFilter.includedModules.description": "调试程序应为其加载符号的模块数组。支持通配符(例如: MyCompany.*.dll)。\r\n\r\n会忽略此属性，除非“模式”设置为 \"loadOnlyIncluded\"。", "generateOptionsSchema.symbolOptions.moduleFilter.mode.description": "控制模块筛选器在两种基本操作模式的下一种模式下操作。", "generateOptionsSchema.symbolOptions.moduleFilter.mode.loadAllButExcluded.enumDescription": "为所有模块加载符号，除非模块在 \"excludedModules\" 数组中。", From 7ffeed490a32d89cc2eab3987edc1d2e7b65759a Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Mon, 4 Mar 2024 20:48:55 -0300 Subject: [PATCH 04/25] Upgrade Debugger (#6947) --- package.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index a4b010759..3dd6a40ab 100644 --- a/package.json +++ b/package.json @@ -452,7 +452,7 @@ { "id": "Debugger", "description": ".NET Core Debugger (Windows / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-win7-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-win7-x64.zip", "installPath": ".debugger/x86_64", "platforms": [ "win32" @@ -462,12 +462,12 @@ "arm64" ], "installTestPath": "./.debugger/x86_64/vsdbg-ui.exe", - "integrity": "31995A00369B2489A3C677EF11B7180B883C665D0BA2CAEF9C8FDE384996C925" + "integrity": "7E8726F7EB729C0AFE4F88834FEA76F7DBB9D6EE0FDC916C0521E7BD49834F74" }, { "id": "Debugger", "description": ".NET Core Debugger (Windows / ARM64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-win10-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-win10-arm64.zip", "installPath": ".debugger/arm64", "platforms": [ "win32" @@ -476,12 +476,12 @@ "arm64" ], "installTestPath": "./.debugger/arm64/vsdbg-ui.exe", - "integrity": "6B4EFE48B76247E897B4427F6D779376868C17BF3CD08CFDED913A94986B9F4E" + "integrity": "7B4B18A9E5357FF6DC7920E5ADF7964AE05F09FF0D0155FFB0642382A45061CB" }, { "id": "Debugger", "description": ".NET Core Debugger (macOS / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-osx-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-osx-x64.zip", "installPath": ".debugger/x86_64", "platforms": [ "darwin" @@ -495,12 +495,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/x86_64/vsdbg-ui", - "integrity": "F634B0D0AF4AF8C7E83E165FA8B1F663CA1D4629C54AE5D2ACBFF96A89F6302D" + "integrity": "EA4666B4785B4AA857F1E13A97DF60D0CAFCEBCBBD4D524F0F8DBD7D7DE8121F" }, { "id": "Debugger", "description": ".NET Core Debugger (macOS / arm64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-osx-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-osx-arm64.zip", "installPath": ".debugger/arm64", "platforms": [ "darwin" @@ -513,12 +513,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/arm64/vsdbg-ui", - "integrity": "8BB85A9D0A9D2D1314D2F6A1E8598C7E358DB27EB7CE8CD09202EA5A6102EA98" + "integrity": "7B94C7E91A1E22E79A21F7C0BC515CAACCAB444922695EDD0568EFF11603505B" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / ARM)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-linux-arm.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-linux-arm.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -531,12 +531,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "9A09FE4B0D6AD7949016981E98AE27BC991E0CA325651008A16AFDF42228C0A7" + "integrity": "C5A0F4457BD677B57E47FFC3B2DB33941908AAD1348FCB3049B6993135D669D3" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / ARM64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-linux-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-linux-arm64.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -549,12 +549,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "AEEC76A9C20160AE29FA992DF74632B501CBF28662F133D6FFC415EB5878D496" + "integrity": "C99993B522E1ABDC1ACB27DD672BC7870CF3F20C3A8EF6E60E2ED5A393369C18" }, { "id": "Debugger", "description": ".NET Core Debugger (linux musl / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-linux-musl-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-linux-musl-x64.zip", "installPath": ".debugger", "platforms": [ "linux-musl" @@ -567,12 +567,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "ADBCAC35AFFF89880FFE73788E87E1E89E77646D336D5EFE8E9953B5565F7F94" + "integrity": "859E8BE17245E49865F6F321C0B7F3A762B8AC526A787027BD90962C1EBE96A3" }, { "id": "Debugger", "description": ".NET Core Debugger (linux musl / ARM64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-linux-musl-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-linux-musl-arm64.zip", "installPath": ".debugger", "platforms": [ "linux-musl" @@ -585,12 +585,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "D7B5EACA7A92829A92DE1E1218B0746CA9C5820A81F7F6360E79A1671860EBAC" + "integrity": "5548E584593140FE35F9AF40D88FCA4EC1E9B6EDBA8F36B5CE72F9C591C66796" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-14/coreclr-debug-linux-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-linux-x64.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -603,7 +603,7 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "059D545D3B1584F122544A1E230C91266FC283F86E40C125A4224D37EE36F049" + "integrity": "F0F5DC8C4DBBE55E753B6C9645E49E145FD8B1B05CE6AEF554B30BE8B0A8ACE1" }, { "id": "Razor", From 5f9e67b1365e3225b7a63d3d0c89de23d5ba91f7 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Sat, 2 Mar 2024 21:48:17 +1100 Subject: [PATCH 05/25] Add option for formatting code block open braces --- package.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3dd6a40ab..921c6d74e 100644 --- a/package.json +++ b/package.json @@ -1978,6 +1978,12 @@ "default": true, "description": "Enable/disable default Razor formatter." }, + "razor.format.codeBlockBraceOnNextLine": { + "type": "boolean", + "scope": "window", + "default": false, + "description": "Forces the open brace after an @code or @functions directive to be on the following line." + }, "razor.completion.commitElementsWithSpace": { "type": "boolean", "scope": "window", @@ -5721,4 +5727,4 @@ } ] } -} \ No newline at end of file +} From 0fe06a4edd7b580404d62827903c6a9dc025e8a6 Mon Sep 17 00:00:00 2001 From: David Wengier Date: Tue, 5 Mar 2024 16:08:43 +1100 Subject: [PATCH 06/25] Bump Razor to 7.0.0-preview.24154.7 --- .vscode/launch.json | 8 ++--- package.json | 86 ++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 102bdcd8c..da0ae978b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -169,8 +169,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/df5123052f373f09ea917bfe3eed062a/razorlanguageserver-linux-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/d824625f4579e30e8db44d60321063ec/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/eec1d3a9302ee33a4cb0e204174d649f/razorlanguageserver-linux-musl-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/7bc6da40ca09c2afb6e83631297e2d33/razorlanguageserver-linux-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/f59f943afd1164f1241c052f51dcfac5/razorlanguageserver-osx-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/18f1f526b2f4d34c0972022aa300a577/razorlanguageserver-osx-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/d3836b547c605fbe7b2d414e990285b8/razorlanguageserver-platformagnostic-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/b07322d606733c7ec0ca7211d7761a08/razorlanguageserver-win-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/6fef4d9f617dd94342383f96cc28e6dd/razorlanguageserver-win-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/5557c0738b48d4fbc040317033b82346/razorlanguageserver-win-x86-7.0.0-preview.24151.1.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.24151.1", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4b87ad9c650d1a126028ddf321ceb414/razorlanguageserver-linux-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/800035f453a9940e55d8ae7d809e17cb/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/ed8daaefd18671d15ea5e8c7443be63e/razorlanguageserver-linux-musl-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/b22635192b6ec100594d9cb43714d9a1/razorlanguageserver-linux-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0fa0001436d8d25e8f280e00fef66f39/razorlanguageserver-osx-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0dbaf11941ee43e084794fa342ee4988/razorlanguageserver-osx-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/9464bb3e526dc42e36558275a02eb723/razorlanguageserver-platformagnostic-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/c4313f9a64c8f0cfc017bf3fc14e1d41/razorlanguageserver-win-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/041b809043c733b8f5948a148488f1c1/razorlanguageserver-win-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/5adbc50be4338beeeb83777f9b00903f/razorlanguageserver-win-x86-7.0.0-preview.24154.7.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.24154.7", "NEW_DEPS_ID": "Razor" }, "cwd": "${workspaceFolder}" @@ -185,8 +185,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/335a13de31886ca24ea4b5e4c3747a3e/devkittelemetry-linux-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/fe4c910f2ee9de76b73346d4cbfca01f/devkittelemetry-linux-musl-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/cd6e7fbec886daa7cba58220498652ef/devkittelemetry-linux-musl-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/6f6b95c75f659e53fc771653f10a34fe/devkittelemetry-linux-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/82723fee5a3b1cdff8e07f9d968abb82/devkittelemetry-osx-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/186727cce33fcb6dad9b4872a3b49f2b/devkittelemetry-osx-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/de0ddda3b603f8c1c2d97358b91f3efc/devkittelemetry-platformagnostic-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/3441e44f0e7558691fbad5cf89b4b34f/devkittelemetry-win-arm64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/baa44b197ca0b0d372fe93de5cd90248/devkittelemetry-win-x64-7.0.0-preview.24151.1.zip,https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/852d5c6eaa576d5c65a25af8b8a1cea6/devkittelemetry-win-x86-7.0.0-preview.24151.1.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.24151.1", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/8a2ecaefa3a40739894c902e6a2864d8/devkittelemetry-linux-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/32f28eb9d870a91dc2b36b2557371501/devkittelemetry-linux-musl-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/846487d0048f3fe00ea88f3800cf5f89/devkittelemetry-linux-musl-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/1460a276de692bdcad14313d26e8b38d/devkittelemetry-linux-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/d41e665b57cb8fd50909b3e4349c6842/devkittelemetry-osx-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/64efd8e7029567ffc0997d8ae7e11c54/devkittelemetry-osx-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/a2f7d9d5a9aa2c2af9a305c654ae284b/devkittelemetry-platformagnostic-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/2dc101f74e9f3547698f6e211ac87071/devkittelemetry-win-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4aa2c18116fdc4c8bfa6e8dd11787949/devkittelemetry-win-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/826f6210f23a3bac8f05e599da1c0145/devkittelemetry-win-x86-7.0.0-preview.24154.7.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.24154.7", "NEW_DEPS_ID": "RazorTelemetry" }, "cwd": "${workspaceFolder}" diff --git a/package.json b/package.json index 921c6d74e..a2b85dc03 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,9 @@ "defaults": { "roslyn": "4.10.0-2.24124.2", "omniSharp": "1.39.11", - "razor": "7.0.0-preview.24151.1", + "razor": "7.0.0-preview.24154.7", "razorOmnisharp": "7.0.0-preview.23363.1", - "razorTelemetry": "7.0.0-preview.24151.1" + "razorTelemetry": "7.0.0-preview.24154.7" }, "main": "./dist/extension", "l10n": "./l10n", @@ -608,7 +608,7 @@ { "id": "Razor", "description": "Razor Language Server (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/6fef4d9f617dd94342383f96cc28e6dd/razorlanguageserver-win-x64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/041b809043c733b8f5948a148488f1c1/razorlanguageserver-win-x64-7.0.0-preview.24154.7.zip", "installPath": ".razor", "platforms": [ "win32" @@ -616,12 +616,12 @@ "architectures": [ "x86_64" ], - "integrity": "AB0C0E9074055663D92BF8638753CE3C95E271F11C3E16F9ACC4CE4324B42598" + "integrity": "72D2AF5DBB3D608D3541D35700BD9951A2189FCBB76BD7395E7B9700B39E4391" }, { "id": "Razor", "description": "Razor Language Server (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/5557c0738b48d4fbc040317033b82346/razorlanguageserver-win-x86-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/5adbc50be4338beeeb83777f9b00903f/razorlanguageserver-win-x86-7.0.0-preview.24154.7.zip", "installPath": ".razor", "platforms": [ "win32" @@ -629,12 +629,12 @@ "architectures": [ "x86" ], - "integrity": "FD73259AF9D0D5BC5A4ABD55B9736482F0C40F91FBE3F7EA0014BB39220E8EFD" + "integrity": "5774D9568578469F4A841F5E4E94DB36E5C2F689036D9F7A5B14226E5E62CD7A" }, { "id": "Razor", "description": "Razor Language Server (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/b07322d606733c7ec0ca7211d7761a08/razorlanguageserver-win-arm64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/c4313f9a64c8f0cfc017bf3fc14e1d41/razorlanguageserver-win-arm64-7.0.0-preview.24154.7.zip", "installPath": ".razor", "platforms": [ "win32" @@ -642,12 +642,12 @@ "architectures": [ "arm64" ], - "integrity": "D9A3F5874412FEE757E54B677005DE3E9B80E48D8E5EFF1416CA9C3572F4642C" + "integrity": "822545ED38373AF87E2E9E1F10F803C3A9BDC392DB898B74B58EEC08A1DF7A4C" }, { "id": "Razor", "description": "Razor Language Server (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/7bc6da40ca09c2afb6e83631297e2d33/razorlanguageserver-linux-x64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/b22635192b6ec100594d9cb43714d9a1/razorlanguageserver-linux-x64-7.0.0-preview.24154.7.zip", "installPath": ".razor", "platforms": [ "linux" @@ -658,12 +658,12 @@ "binaries": [ "./rzls" ], - "integrity": "AE20E1FBE407C93E038AE264C696BA53319AC32CA3B497FEE90A8548E888E0D5" + "integrity": "97015B85A2B83EC78C93684975413DF8610EC97A83A6CF65AA9E97457775A4E7" }, { "id": "Razor", "description": "Razor Language Server (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/df5123052f373f09ea917bfe3eed062a/razorlanguageserver-linux-arm64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4b87ad9c650d1a126028ddf321ceb414/razorlanguageserver-linux-arm64-7.0.0-preview.24154.7.zip", "installPath": ".razor", "platforms": [ "linux" @@ -674,12 +674,12 @@ "binaries": [ "./rzls" ], - "integrity": "1BC2F876009DB0E0667B529331711343CF3D8BC325810A8836146AECFE515C7F" + "integrity": "F63E847BBFC73844B2991F0C2105D1FA3E0EB6A3956C19FC148CD05418648443" }, { "id": "Razor", "description": "Razor Language Server (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/eec1d3a9302ee33a4cb0e204174d649f/razorlanguageserver-linux-musl-x64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/ed8daaefd18671d15ea5e8c7443be63e/razorlanguageserver-linux-musl-x64-7.0.0-preview.24154.7.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -690,12 +690,12 @@ "binaries": [ "./rzls" ], - "integrity": "BDD8DE368048E534C9329B7B66D2922FFBDF10EB3358B487A1328DFC0A5FFF47" + "integrity": "DB6930782D37B832650B4C779737AD08761C72E402A4461539CF5D3BE02D8238" }, { "id": "Razor", "description": "Razor Language Server (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/d824625f4579e30e8db44d60321063ec/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/800035f453a9940e55d8ae7d809e17cb/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24154.7.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -706,12 +706,12 @@ "binaries": [ "./rzls" ], - "integrity": "CD616D433E380D6F29932AEC8D90C541287BDC9231C51853967D7E92A292B899" + "integrity": "098666AB6F3AA8503A51920835A1C532237F3741040EB2EB94B59C5C5D19211E" }, { "id": "Razor", "description": "Razor Language Server (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/18f1f526b2f4d34c0972022aa300a577/razorlanguageserver-osx-x64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0dbaf11941ee43e084794fa342ee4988/razorlanguageserver-osx-x64-7.0.0-preview.24154.7.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -722,12 +722,12 @@ "binaries": [ "./rzls" ], - "integrity": "699E0A522D5EF326DCFA0666182536126BB553AD1FBF27507E8A149B140A6F01" + "integrity": "C82B47A47F5CA0335365BC9E1F19A34C050B03EDB84E70B1D726D87CBED1D3AB" }, { "id": "Razor", "description": "Razor Language Server (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/f59f943afd1164f1241c052f51dcfac5/razorlanguageserver-osx-arm64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0fa0001436d8d25e8f280e00fef66f39/razorlanguageserver-osx-arm64-7.0.0-preview.24154.7.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -738,12 +738,12 @@ "binaries": [ "./rzls" ], - "integrity": "9A4FFCDF762E6ED6A41F22A852DE89E199197DF52228EDCE0E5F0CEF719931F1" + "integrity": "277496BDF1E377DD0DE516D91F7DFB264FD0268D80147D59DC4EDF81D5ECD3B9" }, { "id": "Razor", "description": "Razor Language Server (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/d3836b547c605fbe7b2d414e990285b8/razorlanguageserver-platformagnostic-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/9464bb3e526dc42e36558275a02eb723/razorlanguageserver-platformagnostic-7.0.0-preview.24154.7.zip", "installPath": ".razor", "platforms": [ "neutral" @@ -754,7 +754,7 @@ "binaries": [ "./rzls" ], - "integrity": "3933E9859168AFD6D65E525B736E7B69C8113C4AB44367E5159CCA5E809DE39D" + "integrity": "D2FBD5D9036DFC8A4CE9FAD92E342C86955A187F42528F271FE9C3BEF49EF43B" }, { "id": "RazorOmnisharp", @@ -885,7 +885,7 @@ { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/baa44b197ca0b0d372fe93de5cd90248/devkittelemetry-win-x64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4aa2c18116fdc4c8bfa6e8dd11787949/devkittelemetry-win-x64-7.0.0-preview.24154.7.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -893,12 +893,12 @@ "architectures": [ "x86_64" ], - "integrity": "8EB27E4E82D6906A3A1BABD9B7F830C0D6F79693F2538142D0E3D87CB5478D5F" + "integrity": "2268FDA07A81983D3F1B2429821BBF54B75EB86BC8A416AE128D067207F7D1EA" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/852d5c6eaa576d5c65a25af8b8a1cea6/devkittelemetry-win-x86-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/826f6210f23a3bac8f05e599da1c0145/devkittelemetry-win-x86-7.0.0-preview.24154.7.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -906,12 +906,12 @@ "architectures": [ "x86" ], - "integrity": "13AC5BE6D924B387035202C20A44BC1AFF3F1C62317634964C1B3A12E4A2B7B1" + "integrity": "6291F3CFB4F902DC846346D5793AAD58E0A323D47FC51F7024D84FC087BCA9A5" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/3441e44f0e7558691fbad5cf89b4b34f/devkittelemetry-win-arm64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/2dc101f74e9f3547698f6e211ac87071/devkittelemetry-win-arm64-7.0.0-preview.24154.7.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -919,12 +919,12 @@ "architectures": [ "arm64" ], - "integrity": "58E6B0492B81A7BFFF1E66CB5AF0263E23DEF5A72345D8A23DAB8ADEB761C975" + "integrity": "ED8DE297180418BAFEA43EE5DDB03AFCFBB5E7239549269418423F4929A53069" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/6f6b95c75f659e53fc771653f10a34fe/devkittelemetry-linux-x64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/1460a276de692bdcad14313d26e8b38d/devkittelemetry-linux-x64-7.0.0-preview.24154.7.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -932,12 +932,12 @@ "architectures": [ "x86_64" ], - "integrity": "275C4C88C6EF1B489969C0082F7EFC86ADD2B17F172948BF2E9A61D5D73DD698" + "integrity": "3699749EEFFA0C370A6618AD5136F035F11A39ED871648098EAEF03459D01B8A" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/335a13de31886ca24ea4b5e4c3747a3e/devkittelemetry-linux-arm64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/8a2ecaefa3a40739894c902e6a2864d8/devkittelemetry-linux-arm64-7.0.0-preview.24154.7.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -945,12 +945,12 @@ "architectures": [ "arm64" ], - "integrity": "873758020EF3768819C2F1B93F911348D40BFC87DCE7A0EF1F979C3B4F91910F" + "integrity": "2C8F4288133C7180694D4A1F9748F16BB550DE1B73BB15C4EB56670B7D9B387F" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/cd6e7fbec886daa7cba58220498652ef/devkittelemetry-linux-musl-x64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/846487d0048f3fe00ea88f3800cf5f89/devkittelemetry-linux-musl-x64-7.0.0-preview.24154.7.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -958,12 +958,12 @@ "architectures": [ "x86_64" ], - "integrity": "D4FADF7BAC8B16DE221013BA443474FB6AB8ECF526DF2F6CACE4DD9D9AEB421A" + "integrity": "E9CD70C743F11007AC57C8205B2D9747C9AC7A6C75E9F93646FF2F8B63FB2282" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/fe4c910f2ee9de76b73346d4cbfca01f/devkittelemetry-linux-musl-arm64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/32f28eb9d870a91dc2b36b2557371501/devkittelemetry-linux-musl-arm64-7.0.0-preview.24154.7.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -971,12 +971,12 @@ "architectures": [ "arm64" ], - "integrity": "9044005439E9BBAC20C6F4FB76C66ECF31138E8FD38696F5065253BCB7A7C504" + "integrity": "906808AF06331D853B029D2E89EEAA882BB08D415739D09C69C088D726E779D9" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/186727cce33fcb6dad9b4872a3b49f2b/devkittelemetry-osx-x64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/64efd8e7029567ffc0997d8ae7e11c54/devkittelemetry-osx-x64-7.0.0-preview.24154.7.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -984,12 +984,12 @@ "architectures": [ "x86_64" ], - "integrity": "2A523E297DF03E74926F990BF267286B7F426E67177740DE9503ADBF42D53812" + "integrity": "5361BE8562DD65F82917C424A56A77867122A10C0338C72B6F5B1C9A58F3A1C1" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/82723fee5a3b1cdff8e07f9d968abb82/devkittelemetry-osx-arm64-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/d41e665b57cb8fd50909b3e4349c6842/devkittelemetry-osx-arm64-7.0.0-preview.24154.7.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -997,12 +997,12 @@ "architectures": [ "arm64" ], - "integrity": "879D956ECFDCF9FD5AA97F32E0DF010D05E4AAF03F22227D94A7498CF8E927DD" + "integrity": "E03135140EFAC9950ACE022A264F59A6ABC74313D8118A2E70020F820006E258" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/7d64a966-d0a8-4d4e-bbdc-77b742b6d198/de0ddda3b603f8c1c2d97358b91f3efc/devkittelemetry-platformagnostic-7.0.0-preview.24151.1.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/a2f7d9d5a9aa2c2af9a305c654ae284b/devkittelemetry-platformagnostic-7.0.0-preview.24154.7.zip", "installPath": ".razortelemetry", "platforms": [ "netural" @@ -1010,7 +1010,7 @@ "architectures": [ "neutral" ], - "integrity": "8E4318FCC9D8A5107037FC887DE8622032545BF7770F1D79DC902125384832D3" + "integrity": "A82A53D08C7BBCD408434106DF11B17D5B96B5254383750D3C94BC0FFBD3580A" } ], "engines": { @@ -5727,4 +5727,4 @@ } ] } -} +} \ No newline at end of file From ed94a24c756195f7970f2743ad7c5389072861cf Mon Sep 17 00:00:00 2001 From: David Wengier Date: Tue, 5 Mar 2024 21:15:09 +1100 Subject: [PATCH 07/25] Update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21a02c9fc..fa06c769f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,12 @@ * Upgrade language server to run on .NET 8 (PR: [#72247](https://github.com/dotnet/roslyn/pull/72247)) * Refactors LSP server extension assembly loading (PR: [#71862](https://github.com/dotnet/roslyn/pull/71862)) * Report better warnings and errors if build hosts exit abnormally (PR: [#71909](https://github.com/dotnet/roslyn/pull/71909)) -* Update Razor to 7.0.0-preview.24151.1 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922)) +- Update Razor to 7.0.0-preview.24154.7 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922)) - Upgrade language server to run on .NET 8 (PR: [#9981](https://github.com/dotnet/razor/pull/9981)) - Support inlay hints (PR: [#9904](https://github.com/dotnet/razor/pull/9904) and [#6857](https://github.com/dotnet/vscode-csharp/pull/6857)) - Don't ship as self-contained (PR: [#9891](https://github.com/dotnet/razor/pull/9891)) - Better using directive completiong (PR: [#9982](https://github.com/dotnet/razor/pull/9982)) + - Add option to format code block open brace on new line (PR: [#10018](https://github.com/dotnet/razor/pull/10018) and [#6939](https://github.com/dotnet/vscode-csharp/pull/6939)) ## 2.19.13 * Fix `Attribute` snippet (PR: [#6879](https://github.com/dotnet/vscode-csharp/pull/6879)) From 8b4a8fe458165a2a9cefd2d73ea096ba2c64d45d Mon Sep 17 00:00:00 2001 From: Arun Chander Date: Mon, 11 Mar 2024 10:21:42 -0700 Subject: [PATCH 08/25] Snap prerelease 3/11 (includes debugger updates) --- CHANGELOG.md | 4 ++++ version.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa06c769f..b12824502 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) ## Latest +- Updated debugger to fix .NET debugging break with searchNuGetOrgSymbolServer enabled (PR: [#6937](https://github.com/dotnet/vscode-csharp/pull/6937)) +- Update Razor to add formatting option to force open brace onto the next line after a @code or @functions block (PR: [#10018](https://github.com/dotnet/razor/pull/10018)) + +## 2.22.2 - Update Roslyn to run on .NET 8 (PR: [#6920](https://github.com/dotnet/vscode-csharp/pull/6920)) * Upgrade language server to run on .NET 8 (PR: [#72247](https://github.com/dotnet/roslyn/pull/72247)) * Refactors LSP server extension assembly loading (PR: [#71862](https://github.com/dotnet/roslyn/pull/71862)) diff --git a/version.json b/version.json index ddb621cfd..72ecc5898 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "2.22", + "version": "2.23", "publicReleaseRefSpec": [ "^refs/heads/release$", "^refs/heads/prerelease$", From 798db102a4ec2001d86243858db6147ca05b897e Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Mon, 11 Mar 2024 14:24:08 -0700 Subject: [PATCH 09/25] Update Debugger Packages to v2.19.17 (#6958) --- package.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index a2b85dc03..cbd909bf9 100644 --- a/package.json +++ b/package.json @@ -452,7 +452,7 @@ { "id": "Debugger", "description": ".NET Core Debugger (Windows / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-win7-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-17/coreclr-debug-win7-x64.zip", "installPath": ".debugger/x86_64", "platforms": [ "win32" @@ -462,12 +462,12 @@ "arm64" ], "installTestPath": "./.debugger/x86_64/vsdbg-ui.exe", - "integrity": "7E8726F7EB729C0AFE4F88834FEA76F7DBB9D6EE0FDC916C0521E7BD49834F74" + "integrity": "A4C3C3856B1ABC6461C311AFCDC2373A604F9A5410BDBC279ECADACCE65D25A2" }, { "id": "Debugger", "description": ".NET Core Debugger (Windows / ARM64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-win10-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-17/coreclr-debug-win10-arm64.zip", "installPath": ".debugger/arm64", "platforms": [ "win32" @@ -476,12 +476,12 @@ "arm64" ], "installTestPath": "./.debugger/arm64/vsdbg-ui.exe", - "integrity": "7B4B18A9E5357FF6DC7920E5ADF7964AE05F09FF0D0155FFB0642382A45061CB" + "integrity": "470D1815E79706E4FD92EE1A559E052830822AD7DAF9B53907BAF0067AB261DC" }, { "id": "Debugger", "description": ".NET Core Debugger (macOS / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-osx-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-17/coreclr-debug-osx-x64.zip", "installPath": ".debugger/x86_64", "platforms": [ "darwin" @@ -495,12 +495,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/x86_64/vsdbg-ui", - "integrity": "EA4666B4785B4AA857F1E13A97DF60D0CAFCEBCBBD4D524F0F8DBD7D7DE8121F" + "integrity": "0912770DE5269B7FDF2DA7255D98B88A7FE5E109985E3131858571BD9DCFEC5E" }, { "id": "Debugger", "description": ".NET Core Debugger (macOS / arm64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-osx-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-17/coreclr-debug-osx-arm64.zip", "installPath": ".debugger/arm64", "platforms": [ "darwin" @@ -513,12 +513,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/arm64/vsdbg-ui", - "integrity": "7B94C7E91A1E22E79A21F7C0BC515CAACCAB444922695EDD0568EFF11603505B" + "integrity": "F0DA97D676D2335A9F4C4526BC0BF5C6D49F0EB4F905705FBC4D3D675493E036" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / ARM)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-linux-arm.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-17/coreclr-debug-linux-arm.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -531,12 +531,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "C5A0F4457BD677B57E47FFC3B2DB33941908AAD1348FCB3049B6993135D669D3" + "integrity": "1502C8D4CB3F880476CFFE05B1B3E5552342F213E1A7795D44DDB4679041E2FF" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / ARM64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-linux-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-17/coreclr-debug-linux-arm64.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -549,12 +549,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "C99993B522E1ABDC1ACB27DD672BC7870CF3F20C3A8EF6E60E2ED5A393369C18" + "integrity": "0A8E12B7A50BA28767BF0A036AEB893C9F12B89DB1AD87D0DC08410031C15447" }, { "id": "Debugger", "description": ".NET Core Debugger (linux musl / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-linux-musl-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-17/coreclr-debug-linux-musl-x64.zip", "installPath": ".debugger", "platforms": [ "linux-musl" @@ -567,12 +567,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "859E8BE17245E49865F6F321C0B7F3A762B8AC526A787027BD90962C1EBE96A3" + "integrity": "378D9ED5D02BC453405CEE9B730F38B161A1AA9066566825DE1E7469A084AFB9" }, { "id": "Debugger", "description": ".NET Core Debugger (linux musl / ARM64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-linux-musl-arm64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-17/coreclr-debug-linux-musl-arm64.zip", "installPath": ".debugger", "platforms": [ "linux-musl" @@ -585,12 +585,12 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "5548E584593140FE35F9AF40D88FCA4EC1E9B6EDBA8F36B5CE72F9C591C66796" + "integrity": "7BAABE9EEFD6FFC7DAE067AACA534EAFA26B43DCE64C8481A71833360E74308F" }, { "id": "Debugger", "description": ".NET Core Debugger (linux / x64)", - "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-15/coreclr-debug-linux-x64.zip", + "url": "https://vsdebugger.azureedge.net/coreclr-debug-2-19-17/coreclr-debug-linux-x64.zip", "installPath": ".debugger", "platforms": [ "linux" @@ -603,7 +603,7 @@ "./vsdbg" ], "installTestPath": "./.debugger/vsdbg-ui", - "integrity": "F0F5DC8C4DBBE55E753B6C9645E49E145FD8B1B05CE6AEF554B30BE8B0A8ACE1" + "integrity": "A8A3D0728BBB35352A0D8AF15E986ADF3C104F24FFAD4A5D38A03B91EC0177C0" }, { "id": "Razor", From 5cda5ecc1e91cd075a377286a87955735aaf3f4c Mon Sep 17 00:00:00 2001 From: David Wengier Date: Tue, 12 Mar 2024 16:32:31 +1100 Subject: [PATCH 10/25] Bump Razor and update changelog --- .vscode/launch.json | 8 ++--- CHANGELOG.md | 4 ++- package.json | 84 ++++++++++++++++++++++----------------------- 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index da0ae978b..e44ab6f43 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -169,8 +169,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4b87ad9c650d1a126028ddf321ceb414/razorlanguageserver-linux-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/800035f453a9940e55d8ae7d809e17cb/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/ed8daaefd18671d15ea5e8c7443be63e/razorlanguageserver-linux-musl-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/b22635192b6ec100594d9cb43714d9a1/razorlanguageserver-linux-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0fa0001436d8d25e8f280e00fef66f39/razorlanguageserver-osx-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0dbaf11941ee43e084794fa342ee4988/razorlanguageserver-osx-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/9464bb3e526dc42e36558275a02eb723/razorlanguageserver-platformagnostic-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/c4313f9a64c8f0cfc017bf3fc14e1d41/razorlanguageserver-win-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/041b809043c733b8f5948a148488f1c1/razorlanguageserver-win-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/5adbc50be4338beeeb83777f9b00903f/razorlanguageserver-win-x86-7.0.0-preview.24154.7.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.24154.7", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/85d6dcb5b0164aa042c88d4668d94041/razorlanguageserver-linux-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/6a89b05d4c14a3542789c3ca650018b6/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b37a814188d56ac90f409a6e49098f4f/razorlanguageserver-linux-musl-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/04efb92c455ec620381317a43c480a1b/razorlanguageserver-linux-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/dfdfeadc3ed450706a0d00e057773fc6/razorlanguageserver-osx-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/2d73f9a16d450702b8ac8dbdde142799/razorlanguageserver-osx-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa73364791a8e908ff44a159d1f000d3/razorlanguageserver-platformagnostic-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa38f7d2ee74d0929e47c30d718ac096/razorlanguageserver-win-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fde24d8c856defdccbb652be05bc0fea/razorlanguageserver-win-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/ae634e36d0694be331db134d6c5494e8/razorlanguageserver-win-x86-7.0.0-preview.24161.6.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.24161.6", "NEW_DEPS_ID": "Razor" }, "cwd": "${workspaceFolder}" @@ -185,8 +185,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/8a2ecaefa3a40739894c902e6a2864d8/devkittelemetry-linux-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/32f28eb9d870a91dc2b36b2557371501/devkittelemetry-linux-musl-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/846487d0048f3fe00ea88f3800cf5f89/devkittelemetry-linux-musl-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/1460a276de692bdcad14313d26e8b38d/devkittelemetry-linux-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/d41e665b57cb8fd50909b3e4349c6842/devkittelemetry-osx-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/64efd8e7029567ffc0997d8ae7e11c54/devkittelemetry-osx-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/a2f7d9d5a9aa2c2af9a305c654ae284b/devkittelemetry-platformagnostic-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/2dc101f74e9f3547698f6e211ac87071/devkittelemetry-win-arm64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4aa2c18116fdc4c8bfa6e8dd11787949/devkittelemetry-win-x64-7.0.0-preview.24154.7.zip,https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/826f6210f23a3bac8f05e599da1c0145/devkittelemetry-win-x86-7.0.0-preview.24154.7.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.24154.7", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/37c9cbad7a9df0efa17d40da3b8ff303/devkittelemetry-linux-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/782d968486f5324e3ff0c7d5fbc31191/devkittelemetry-linux-musl-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/7fc42bdb835a845efb4ee7cc5cf606d9/devkittelemetry-linux-musl-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b50efac289c46267b8e67318ab840ee4/devkittelemetry-linux-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9f4cdc6489f81ee9d94c218a61bc19a0/devkittelemetry-osx-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/473295a389ea3331c39b6bab7e52d990/devkittelemetry-osx-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9e99d301df6c535a4b5e031fbf3695d4/devkittelemetry-platformagnostic-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/36519b4fb02af42c26e5df12592999cc/devkittelemetry-win-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/c32a8e0f3ef1690f9b76dafabbfa8cae/devkittelemetry-win-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/5bf809c31472e7f6b734540f4f80c5f9/devkittelemetry-win-x86-7.0.0-preview.24161.6.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.24161.6", "NEW_DEPS_ID": "RazorTelemetry" }, "cwd": "${workspaceFolder}" diff --git a/CHANGELOG.md b/CHANGELOG.md index fa06c769f..8c644d5d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,14 @@ * Upgrade language server to run on .NET 8 (PR: [#72247](https://github.com/dotnet/roslyn/pull/72247)) * Refactors LSP server extension assembly loading (PR: [#71862](https://github.com/dotnet/roslyn/pull/71862)) * Report better warnings and errors if build hosts exit abnormally (PR: [#71909](https://github.com/dotnet/roslyn/pull/71909)) -- Update Razor to 7.0.0-preview.24154.7 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922)) +- Update Razor to 7.0.0-preview.24161.6 (PR: [#6922](https://github.com/dotnet/vscode-csharp/pull/6922)) - Upgrade language server to run on .NET 8 (PR: [#9981](https://github.com/dotnet/razor/pull/9981)) - Support inlay hints (PR: [#9904](https://github.com/dotnet/razor/pull/9904) and [#6857](https://github.com/dotnet/vscode-csharp/pull/6857)) - Don't ship as self-contained (PR: [#9891](https://github.com/dotnet/razor/pull/9891)) - Better using directive completiong (PR: [#9982](https://github.com/dotnet/razor/pull/9982)) - Add option to format code block open brace on new line (PR: [#10018](https://github.com/dotnet/razor/pull/10018) and [#6939](https://github.com/dotnet/vscode-csharp/pull/6939)) + - Fix an issue that could cause numerous semantic tokens LSP failures on new projects (PR: [#10050](https://github.com/dotnet/razor/pull/10050)) + - Fix an issue with running on .NET 9 preview builds (PR: [#10064](https://github.com/dotnet/razor/pull/10064)) ## 2.19.13 * Fix `Attribute` snippet (PR: [#6879](https://github.com/dotnet/vscode-csharp/pull/6879)) diff --git a/package.json b/package.json index cbd909bf9..fa525e19f 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,9 @@ "defaults": { "roslyn": "4.10.0-2.24124.2", "omniSharp": "1.39.11", - "razor": "7.0.0-preview.24154.7", + "razor": "7.0.0-preview.24161.6", "razorOmnisharp": "7.0.0-preview.23363.1", - "razorTelemetry": "7.0.0-preview.24154.7" + "razorTelemetry": "7.0.0-preview.24161.6" }, "main": "./dist/extension", "l10n": "./l10n", @@ -608,7 +608,7 @@ { "id": "Razor", "description": "Razor Language Server (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/041b809043c733b8f5948a148488f1c1/razorlanguageserver-win-x64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fde24d8c856defdccbb652be05bc0fea/razorlanguageserver-win-x64-7.0.0-preview.24161.6.zip", "installPath": ".razor", "platforms": [ "win32" @@ -616,12 +616,12 @@ "architectures": [ "x86_64" ], - "integrity": "72D2AF5DBB3D608D3541D35700BD9951A2189FCBB76BD7395E7B9700B39E4391" + "integrity": "102C4A85794380CA6102E1519B81A45528EFC845F007B0A1BF57D18B1044618F" }, { "id": "Razor", "description": "Razor Language Server (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/5adbc50be4338beeeb83777f9b00903f/razorlanguageserver-win-x86-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/ae634e36d0694be331db134d6c5494e8/razorlanguageserver-win-x86-7.0.0-preview.24161.6.zip", "installPath": ".razor", "platforms": [ "win32" @@ -629,12 +629,12 @@ "architectures": [ "x86" ], - "integrity": "5774D9568578469F4A841F5E4E94DB36E5C2F689036D9F7A5B14226E5E62CD7A" + "integrity": "5B926A914DA51D0CEB3924EF9D2CC5FD5D55C9CDB0812C01A3C0FA8C7961DE14" }, { "id": "Razor", "description": "Razor Language Server (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/c4313f9a64c8f0cfc017bf3fc14e1d41/razorlanguageserver-win-arm64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa38f7d2ee74d0929e47c30d718ac096/razorlanguageserver-win-arm64-7.0.0-preview.24161.6.zip", "installPath": ".razor", "platforms": [ "win32" @@ -642,12 +642,12 @@ "architectures": [ "arm64" ], - "integrity": "822545ED38373AF87E2E9E1F10F803C3A9BDC392DB898B74B58EEC08A1DF7A4C" + "integrity": "39F34ACE165B4FCAF26C1A6078A6291D096070DCBFEAA543E36D98BB6F64180F" }, { "id": "Razor", "description": "Razor Language Server (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/b22635192b6ec100594d9cb43714d9a1/razorlanguageserver-linux-x64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/04efb92c455ec620381317a43c480a1b/razorlanguageserver-linux-x64-7.0.0-preview.24161.6.zip", "installPath": ".razor", "platforms": [ "linux" @@ -658,12 +658,12 @@ "binaries": [ "./rzls" ], - "integrity": "97015B85A2B83EC78C93684975413DF8610EC97A83A6CF65AA9E97457775A4E7" + "integrity": "92797C5A70763AE69A34D66860AFFF0A8D2E40E43D297EA0A9255CCD6D7A1EC0" }, { "id": "Razor", "description": "Razor Language Server (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4b87ad9c650d1a126028ddf321ceb414/razorlanguageserver-linux-arm64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/85d6dcb5b0164aa042c88d4668d94041/razorlanguageserver-linux-arm64-7.0.0-preview.24161.6.zip", "installPath": ".razor", "platforms": [ "linux" @@ -674,12 +674,12 @@ "binaries": [ "./rzls" ], - "integrity": "F63E847BBFC73844B2991F0C2105D1FA3E0EB6A3956C19FC148CD05418648443" + "integrity": "C52F23F456B6D28A154F7DACF36F68B2DE18C3E4FE444AF8EF76591D07248312" }, { "id": "Razor", "description": "Razor Language Server (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/ed8daaefd18671d15ea5e8c7443be63e/razorlanguageserver-linux-musl-x64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b37a814188d56ac90f409a6e49098f4f/razorlanguageserver-linux-musl-x64-7.0.0-preview.24161.6.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -690,12 +690,12 @@ "binaries": [ "./rzls" ], - "integrity": "DB6930782D37B832650B4C779737AD08761C72E402A4461539CF5D3BE02D8238" + "integrity": "AA12F5F3EA6C8159E4F4BE3B2C9D70DF87D0E849547F2484501EB78E7C9716EF" }, { "id": "Razor", "description": "Razor Language Server (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/800035f453a9940e55d8ae7d809e17cb/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/6a89b05d4c14a3542789c3ca650018b6/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24161.6.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -706,12 +706,12 @@ "binaries": [ "./rzls" ], - "integrity": "098666AB6F3AA8503A51920835A1C532237F3741040EB2EB94B59C5C5D19211E" + "integrity": "6EAC43F45A06D894A99B9B40E75D97FAB6986D2EE7A123A0B9FE54E30CDA53D9" }, { "id": "Razor", "description": "Razor Language Server (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0dbaf11941ee43e084794fa342ee4988/razorlanguageserver-osx-x64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/2d73f9a16d450702b8ac8dbdde142799/razorlanguageserver-osx-x64-7.0.0-preview.24161.6.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -722,12 +722,12 @@ "binaries": [ "./rzls" ], - "integrity": "C82B47A47F5CA0335365BC9E1F19A34C050B03EDB84E70B1D726D87CBED1D3AB" + "integrity": "9379E0DFB02C99C67024798D7430FEC193632DDA731E425AC184724326778A11" }, { "id": "Razor", "description": "Razor Language Server (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/0fa0001436d8d25e8f280e00fef66f39/razorlanguageserver-osx-arm64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/dfdfeadc3ed450706a0d00e057773fc6/razorlanguageserver-osx-arm64-7.0.0-preview.24161.6.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -738,12 +738,12 @@ "binaries": [ "./rzls" ], - "integrity": "277496BDF1E377DD0DE516D91F7DFB264FD0268D80147D59DC4EDF81D5ECD3B9" + "integrity": "A1DBCD2E53743A9912FCC1C6C00D251D107413F02256575945CAB54C4257867F" }, { "id": "Razor", "description": "Razor Language Server (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/9464bb3e526dc42e36558275a02eb723/razorlanguageserver-platformagnostic-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa73364791a8e908ff44a159d1f000d3/razorlanguageserver-platformagnostic-7.0.0-preview.24161.6.zip", "installPath": ".razor", "platforms": [ "neutral" @@ -754,7 +754,7 @@ "binaries": [ "./rzls" ], - "integrity": "D2FBD5D9036DFC8A4CE9FAD92E342C86955A187F42528F271FE9C3BEF49EF43B" + "integrity": "41EB32001E14B4373A3307E39752AE72D92172B875EF9E4342F97371867E9627" }, { "id": "RazorOmnisharp", @@ -885,7 +885,7 @@ { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/4aa2c18116fdc4c8bfa6e8dd11787949/devkittelemetry-win-x64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/c32a8e0f3ef1690f9b76dafabbfa8cae/devkittelemetry-win-x64-7.0.0-preview.24161.6.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -893,12 +893,12 @@ "architectures": [ "x86_64" ], - "integrity": "2268FDA07A81983D3F1B2429821BBF54B75EB86BC8A416AE128D067207F7D1EA" + "integrity": "EEB71A415D0B1064462EAFF6DAD5451B7EBABF596E0651B1427387A2BA5EFA42" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/826f6210f23a3bac8f05e599da1c0145/devkittelemetry-win-x86-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/5bf809c31472e7f6b734540f4f80c5f9/devkittelemetry-win-x86-7.0.0-preview.24161.6.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -906,12 +906,12 @@ "architectures": [ "x86" ], - "integrity": "6291F3CFB4F902DC846346D5793AAD58E0A323D47FC51F7024D84FC087BCA9A5" + "integrity": "733B72988371061F45C7749ADCDB4823B7CD6CE6F0ED9C8B8FAE48EEF1E58A7F" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/2dc101f74e9f3547698f6e211ac87071/devkittelemetry-win-arm64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/36519b4fb02af42c26e5df12592999cc/devkittelemetry-win-arm64-7.0.0-preview.24161.6.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -919,12 +919,12 @@ "architectures": [ "arm64" ], - "integrity": "ED8DE297180418BAFEA43EE5DDB03AFCFBB5E7239549269418423F4929A53069" + "integrity": "DAD54EC91D11EE1BA4DFFE3A2208BE49F8962551698388FB51B46F43022B9F8D" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/1460a276de692bdcad14313d26e8b38d/devkittelemetry-linux-x64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b50efac289c46267b8e67318ab840ee4/devkittelemetry-linux-x64-7.0.0-preview.24161.6.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -932,12 +932,12 @@ "architectures": [ "x86_64" ], - "integrity": "3699749EEFFA0C370A6618AD5136F035F11A39ED871648098EAEF03459D01B8A" + "integrity": "EDC6A71168CE4D7928BB8E27CB18A1F4EDB408B513866482009C39DABC613F2E" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/8a2ecaefa3a40739894c902e6a2864d8/devkittelemetry-linux-arm64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/37c9cbad7a9df0efa17d40da3b8ff303/devkittelemetry-linux-arm64-7.0.0-preview.24161.6.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -945,12 +945,12 @@ "architectures": [ "arm64" ], - "integrity": "2C8F4288133C7180694D4A1F9748F16BB550DE1B73BB15C4EB56670B7D9B387F" + "integrity": "13C1061CFBB7EE2936CE5B2429881204EFC3BE7370D93C1C9D0A2BF71AC25DEE" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/846487d0048f3fe00ea88f3800cf5f89/devkittelemetry-linux-musl-x64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/7fc42bdb835a845efb4ee7cc5cf606d9/devkittelemetry-linux-musl-x64-7.0.0-preview.24161.6.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -958,12 +958,12 @@ "architectures": [ "x86_64" ], - "integrity": "E9CD70C743F11007AC57C8205B2D9747C9AC7A6C75E9F93646FF2F8B63FB2282" + "integrity": "3EAC160A974D179A58184AD1493BD23DF3D785BFF37E4D71ECAA886F04225182" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/32f28eb9d870a91dc2b36b2557371501/devkittelemetry-linux-musl-arm64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/782d968486f5324e3ff0c7d5fbc31191/devkittelemetry-linux-musl-arm64-7.0.0-preview.24161.6.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -971,12 +971,12 @@ "architectures": [ "arm64" ], - "integrity": "906808AF06331D853B029D2E89EEAA882BB08D415739D09C69C088D726E779D9" + "integrity": "7FD37E7AA8EE97C063ABB402E40B62D60152EBFFAB4404B3C60162EAA3442B20" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/64efd8e7029567ffc0997d8ae7e11c54/devkittelemetry-osx-x64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/473295a389ea3331c39b6bab7e52d990/devkittelemetry-osx-x64-7.0.0-preview.24161.6.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -984,12 +984,12 @@ "architectures": [ "x86_64" ], - "integrity": "5361BE8562DD65F82917C424A56A77867122A10C0338C72B6F5B1C9A58F3A1C1" + "integrity": "2A6B12BAAABC8BCFD3044AC636D3F76B15B9018B50B4590844ED6901823EF310" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/d41e665b57cb8fd50909b3e4349c6842/devkittelemetry-osx-arm64-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9f4cdc6489f81ee9d94c218a61bc19a0/devkittelemetry-osx-arm64-7.0.0-preview.24161.6.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -997,12 +997,12 @@ "architectures": [ "arm64" ], - "integrity": "E03135140EFAC9950ACE022A264F59A6ABC74313D8118A2E70020F820006E258" + "integrity": "54C311DB0BA90CEF48B3043462C401CA6ED1BBE5C0DF536350075F66FCFD2890" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/b7e3bbfa-a1e1-4b7f-8605-ec0e0835b40e/a2f7d9d5a9aa2c2af9a305c654ae284b/devkittelemetry-platformagnostic-7.0.0-preview.24154.7.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9e99d301df6c535a4b5e031fbf3695d4/devkittelemetry-platformagnostic-7.0.0-preview.24161.6.zip", "installPath": ".razortelemetry", "platforms": [ "netural" @@ -1010,7 +1010,7 @@ "architectures": [ "neutral" ], - "integrity": "A82A53D08C7BBCD408434106DF11B17D5B96B5254383750D3C94BC0FFBD3580A" + "integrity": "5F56C977B57E6F241B2775EC2E121C977D0B294D9CFD5361A3B970BC56145FBB" } ], "engines": { From 57cc0b472bc95ac109188a6c79087296901ba4bf Mon Sep 17 00:00:00 2001 From: David Barbet Date: Wed, 13 Mar 2024 12:52:40 -0700 Subject: [PATCH 11/25] Do not timeout on connecting to the server if waitForDebugger is set --- src/lsptoolshost/roslynLanguageServer.ts | 78 +++++++++++++----------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/src/lsptoolshost/roslynLanguageServer.ts b/src/lsptoolshost/roslynLanguageServer.ts index a27eb72ae..88956a6d4 100644 --- a/src/lsptoolshost/roslynLanguageServer.ts +++ b/src/lsptoolshost/roslynLanguageServer.ts @@ -590,63 +590,67 @@ export class RoslynLanguageServer { const result: string = isString(data) ? data : data.toString(RoslynLanguageServer.encoding); _channel.append('[stderr] ' + result); }); + childProcess.on('exit', (code) => { + _channel.appendLine(`Language server process exited with ${code}`); + }); // Timeout promise used to time out the connection process if it takes too long. - const timeout = new Promise((resolve, reject) => { + const timeout = new Promise((resolve) => { RAL().timer.setTimeout(resolve, languageServerOptions.startTimeout); + }); + const connectionPromise = new Promise((resolveConnection, rejectConnection) => { // If the child process exited unexpectedly, reject the promise early. // Error information will be captured from the stdout/stderr streams above. childProcess.on('exit', (code) => { if (code && code !== 0) { - const message = `Language server process exited with ${code}`; - _channel.appendLine(message); - reject(new Error(message)); + rejectConnection(new Error('Language server process exited unexpectedly')); } }); - }); - // The server process will create the named pipe used for communication. Wait for it to be created, - // and listen for the server to pass back the connection information via stdout. - const namedPipeConnectionPromise = new Promise((resolve) => { - _channel.appendLine('waiting for named pipe information from server...'); - childProcess.stdout.on('data', (data: { toString: (arg0: any) => any }) => { - const result: string = isString(data) ? data : data.toString(RoslynLanguageServer.encoding); - // Use the regular expression to find all JSON lines - const jsonLines = result.match(RoslynLanguageServer.namedPipeKeyRegex); - if (jsonLines) { - const transmittedPipeNameInfo: NamedPipeInformation = JSON.parse(jsonLines[0]); - _channel.appendLine('received named pipe information from server'); - resolve(transmittedPipeNameInfo); - } + // The server process will create the named pipe used for communication. Wait for it to be created, + // and listen for the server to pass back the connection information via stdout. + const namedPipePromise = new Promise((resolve) => { + _channel.appendLine('waiting for named pipe information from server...'); + childProcess.stdout.on('data', (data: { toString: (arg0: any) => any }) => { + const result: string = isString(data) ? data : data.toString(RoslynLanguageServer.encoding); + // Use the regular expression to find all JSON lines + const jsonLines = result.match(RoslynLanguageServer.namedPipeKeyRegex); + if (jsonLines) { + const transmittedPipeNameInfo: NamedPipeInformation = JSON.parse(jsonLines[0]); + _channel.appendLine('received named pipe information from server'); + resolve(transmittedPipeNameInfo); + } + }); }); - }); - // Wait for the server to send back the name of the pipe to connect to. - // If it takes too long it will timeout and throw an error. - const pipeConnectionInfo = await Promise.race([namedPipeConnectionPromise, timeout]); - if (pipeConnectionInfo === undefined) { - throw new Error('Timeout. Named pipe information not received from server.'); - } + const socketPromise = namedPipePromise.then(async (pipeConnectionInfo) => { + return new Promise((resolve, reject) => { + _channel.appendLine('attempting to connect client to server...'); + const socket = net.createConnection(pipeConnectionInfo.pipeName, () => { + _channel.appendLine('client has connected to server'); + resolve(socket); + }); - const socketPromise = new Promise((resolve, reject) => { - _channel.appendLine('attempting to connect client to server...'); - const socket = net.createConnection(pipeConnectionInfo.pipeName, () => { - _channel.appendLine('client has connected to server'); - resolve(socket); + // If we failed to connect for any reason, ensure the error is propagated. + socket.on('error', (err) => reject(err)); + }); }); - // If we failed to connect for any reason, ensure the error is propagated. - socket.on('error', (err) => reject(err)); + socketPromise.then(resolveConnection, rejectConnection); }); // Wait for the client to connect to the named pipe. - // If it takes too long it will timeout and throw an error. - const socket = await Promise.race([socketPromise, timeout]); + let socket: net.Socket | undefined; + if (commonOptions.waitForDebugger) { + // Do not timeout the connection when the waitForDebugger option is set. + socket = await connectionPromise; + } else { + socket = await Promise.race([connectionPromise, timeout]); + } + if (socket === undefined) { - throw new Error( - 'Timeout. Client cound not connect to server via named pipe: ' + pipeConnectionInfo.pipeName - ); + throw new Error('Timeout. Client cound not connect to server via named pipe'); } return { From 5fded900d41855f8556f7c75100f8c8ac881e5c8 Mon Sep 17 00:00:00 2001 From: Shen Chen Date: Fri, 15 Mar 2024 13:14:12 -0700 Subject: [PATCH 12/25] Initial change --- azure-pipelines/loc.yml | 126 +++++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 59 deletions(-) diff --git a/azure-pipelines/loc.yml b/azure-pipelines/loc.yml index 103850c46..c2923a904 100644 --- a/azure-pipelines/loc.yml +++ b/azure-pipelines/loc.yml @@ -20,67 +20,75 @@ parameters: type: boolean default: true +repositories: +- repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + variables: # Variable group contains the PAT to LOC - group: OneLocBuildVariables -stages: -- stage: LocalizationStage - condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') - jobs: - - job: Localization +extends: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: pool: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals windows.vs2022preview.amd64 - steps: - - task: NodeTool@0 - displayName: 'Install Node.js 18.x' - inputs: - # Octokit client needs 18.x to have 'fetch' function. - versionSpec: '18.x' - - checkout: self - clean: true - submodules: true - fetchTags: false - fetchDepth: 0 - - pwsh: | - npm install - npm install -g gulp - displayName: 'Install tools' - - pwsh: npm run compile - displayName: 'Compile' - - pwsh: npm run l10nDevGenerateLocalizationBundle - displayName: 'Generate bundle.l10.json' - - pwsh: npm run l10nDevGenerateXlf - displayName: 'Generate xlf files from bundle.10n.json' - - task: OneLocBuild@2 - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - inputs: - locProj: loc/LocProject.json - outDir: '$(Build.SourcesDirectory)/loc' - isCreatePrSelected: false - patVariable: $(dn-bot-ceapex-package-r) - packageSourceAuth: patAuth - lclSource: lclFilesfromPackage - LclPackageId: 'LCL-JUNO-PROD-VSCODECS' - - pwsh: npm run l10nDevImportXlf - displayName: 'Import xlf to json.' - - pwsh: gulp 'publish localization content' --userName dotnet-bot --email dotnet-bot@dotnetfoundation.org --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main' - displayName: 'Create PR in GitHub.' - env: - GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT) - - task: PublishBuildArtifacts@1 - displayName: 'Publish Localization Files' - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/loc' - PublishLocation: Container - ArtifactName: Loc - condition: ${{ parameters.publishLocalizationFile }} - - task: PublishBuildArtifacts@1 - displayName: 'Publish l10n file' - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/l10n' - PublishLocation: Container - ArtifactName: l10n - condition: ${{ parameters.publishLocalizationFile }} + name: NetCore1ESPool-Svc-Internal + image: 1es-windows-2022-pt + os: windows + stages: + - stage: LocalizationStage + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') + jobs: + - job: Localization + templateContext: + outputs: + - output: pipelineArtifact + displayName: LOC + targetPath: '$(Build.SourcesDirectory)/loc' + condition: ${{ parameters.publishLocalizationFile }} + artifactName: loc + - output: pipelineArtifact + displayName: l10n + targetPath: '$(Build.SourcesDirectory)/l10n' + condition: ${{ parameters.publishLocalizationFile }} + artifactName: l10n + steps: + - task: NodeTool@0 + displayName: 'Install Node.js 18.x' + inputs: + # Octokit client needs 18.x to have 'fetch' function. + versionSpec: '18.x' + - checkout: self + clean: true + submodules: true + fetchTags: false + fetchDepth: 0 + - pwsh: | + npm install + npm install -g gulp + displayName: 'Install tools' + - pwsh: npm run compile + displayName: 'Compile' + - pwsh: npm run l10nDevGenerateLocalizationBundle + displayName: 'Generate bundle.l10.json' + - pwsh: npm run l10nDevGenerateXlf + displayName: 'Generate xlf files from bundle.10n.json' + - task: OneLocBuild@2 + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: loc/LocProject.json + outDir: '$(Build.SourcesDirectory)/loc' + isCreatePrSelected: false + patVariable: $(dn-bot-ceapex-package-r) + packageSourceAuth: patAuth + lclSource: lclFilesfromPackage + LclPackageId: 'LCL-JUNO-PROD-VSCODECS' + - pwsh: npm run l10nDevImportXlf + displayName: 'Import xlf to json.' + - pwsh: gulp 'publish localization content' --userName dotnet-bot --email dotnet-bot@dotnetfoundation.org --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main' + displayName: 'Create PR in GitHub.' + env: + GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT) \ No newline at end of file From 623c7724cf3fc0a2a014573059af80fbf135fd67 Mon Sep 17 00:00:00 2001 From: Shen Chen Date: Fri, 15 Mar 2024 13:18:46 -0700 Subject: [PATCH 13/25] Fix --- azure-pipelines/loc.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/azure-pipelines/loc.yml b/azure-pipelines/loc.yml index c2923a904..f8bd2d380 100644 --- a/azure-pipelines/loc.yml +++ b/azure-pipelines/loc.yml @@ -20,11 +20,12 @@ parameters: type: boolean default: true -repositories: -- repository: 1ESPipelineTemplates - type: git - name: 1ESPipelineTemplates/1ESPipelineTemplates - ref: refs/tags/release +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release variables: # Variable group contains the PAT to LOC From 9b44a9563bdd4ef19168fbc3dcb405b8594a56ae Mon Sep 17 00:00:00 2001 From: Shen Chen Date: Fri, 15 Mar 2024 13:41:48 -0700 Subject: [PATCH 14/25] test --- .vscode/settings.json | 3 +- azure-pipelines/loc.yml | 111 +++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 54 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ccd7bad68..7797812e7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -20,5 +20,6 @@ "editor.formatOnSave": false, "eslint.lintTask.enable": true, "dotnet.defaultSolution": "disable", - "jest.autoRun": "off" + "jest.autoRun": "off", + "azure-pipelines.1ESPipelineTemplatesSchemaFile": true } diff --git a/azure-pipelines/loc.yml b/azure-pipelines/loc.yml index f8bd2d380..3a3b26b74 100644 --- a/azure-pipelines/loc.yml +++ b/azure-pipelines/loc.yml @@ -32,7 +32,7 @@ variables: - group: OneLocBuildVariables extends: - template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates parameters: pool: name: NetCore1ESPool-Svc-Internal @@ -40,56 +40,61 @@ extends: os: windows stages: - stage: LocalizationStage - condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') + # condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') jobs: - - job: Localization - templateContext: - outputs: - - output: pipelineArtifact - displayName: LOC - targetPath: '$(Build.SourcesDirectory)/loc' - condition: ${{ parameters.publishLocalizationFile }} - artifactName: loc - - output: pipelineArtifact - displayName: l10n - targetPath: '$(Build.SourcesDirectory)/l10n' - condition: ${{ parameters.publishLocalizationFile }} - artifactName: l10n - steps: - - task: NodeTool@0 - displayName: 'Install Node.js 18.x' - inputs: - # Octokit client needs 18.x to have 'fetch' function. - versionSpec: '18.x' - - checkout: self - clean: true - submodules: true - fetchTags: false - fetchDepth: 0 - - pwsh: | - npm install - npm install -g gulp - displayName: 'Install tools' - - pwsh: npm run compile - displayName: 'Compile' - - pwsh: npm run l10nDevGenerateLocalizationBundle - displayName: 'Generate bundle.l10.json' - - pwsh: npm run l10nDevGenerateXlf - displayName: 'Generate xlf files from bundle.10n.json' - - task: OneLocBuild@2 - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - inputs: - locProj: loc/LocProject.json - outDir: '$(Build.SourcesDirectory)/loc' - isCreatePrSelected: false - patVariable: $(dn-bot-ceapex-package-r) - packageSourceAuth: patAuth - lclSource: lclFilesfromPackage - LclPackageId: 'LCL-JUNO-PROD-VSCODECS' - - pwsh: npm run l10nDevImportXlf - displayName: 'Import xlf to json.' - - pwsh: gulp 'publish localization content' --userName dotnet-bot --email dotnet-bot@dotnetfoundation.org --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main' - displayName: 'Create PR in GitHub.' - env: - GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT) \ No newline at end of file + - job: test + steps: + - pwsh: echo "Hello 1ES" + +# jobs: +# - job: Localization +# templateContext: +# outputs: +# - output: pipelineArtifact +# displayName: LOC +# targetPath: '$(Build.SourcesDirectory)/loc' +# condition: ${{ parameters.publishLocalizationFile }} +# artifactName: loc +# - output: pipelineArtifact +# displayName: l10n +# targetPath: '$(Build.SourcesDirectory)/l10n' +# condition: ${{ parameters.publishLocalizationFile }} +# artifactName: l10n +# steps: +# - task: NodeTool@0 +# displayName: 'Install Node.js 18.x' +# inputs: +# # Octokit client needs 18.x to have 'fetch' function. +# versionSpec: '18.x' +# - checkout: self +# clean: true +# submodules: true +# fetchTags: false +# fetchDepth: 0 +# - pwsh: | +# npm install +# npm install -g gulp +# displayName: 'Install tools' +# - pwsh: npm run compile +# displayName: 'Compile' +# - pwsh: npm run l10nDevGenerateLocalizationBundle +# displayName: 'Generate bundle.l10.json' +# - pwsh: npm run l10nDevGenerateXlf +# displayName: 'Generate xlf files from bundle.10n.json' +# - task: OneLocBuild@2 +# env: +# SYSTEM_ACCESSTOKEN: $(System.AccessToken) +# inputs: +# locProj: loc/LocProject.json +# outDir: '$(Build.SourcesDirectory)/loc' +# isCreatePrSelected: false +# patVariable: $(dn-bot-ceapex-package-r) +# packageSourceAuth: patAuth +# lclSource: lclFilesfromPackage +# LclPackageId: 'LCL-JUNO-PROD-VSCODECS' +# - pwsh: npm run l10nDevImportXlf +# displayName: 'Import xlf to json.' +# - pwsh: gulp 'publish localization content' --userName dotnet-bot --email dotnet-bot@dotnetfoundation.org --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main' +# displayName: 'Create PR in GitHub.' +# env: +# GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT) \ No newline at end of file From cc9131d658435671b895098b47ed32d5b64f9df2 Mon Sep 17 00:00:00 2001 From: Shen Chen Date: Fri, 15 Mar 2024 15:36:50 -0700 Subject: [PATCH 15/25] Connect the loc --- azure-pipelines/loc.yml | 107 +++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 56 deletions(-) diff --git a/azure-pipelines/loc.yml b/azure-pipelines/loc.yml index 3a3b26b74..ad05b942b 100644 --- a/azure-pipelines/loc.yml +++ b/azure-pipelines/loc.yml @@ -42,59 +42,54 @@ extends: - stage: LocalizationStage # condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') jobs: - - job: test - steps: - - pwsh: echo "Hello 1ES" - -# jobs: -# - job: Localization -# templateContext: -# outputs: -# - output: pipelineArtifact -# displayName: LOC -# targetPath: '$(Build.SourcesDirectory)/loc' -# condition: ${{ parameters.publishLocalizationFile }} -# artifactName: loc -# - output: pipelineArtifact -# displayName: l10n -# targetPath: '$(Build.SourcesDirectory)/l10n' -# condition: ${{ parameters.publishLocalizationFile }} -# artifactName: l10n -# steps: -# - task: NodeTool@0 -# displayName: 'Install Node.js 18.x' -# inputs: -# # Octokit client needs 18.x to have 'fetch' function. -# versionSpec: '18.x' -# - checkout: self -# clean: true -# submodules: true -# fetchTags: false -# fetchDepth: 0 -# - pwsh: | -# npm install -# npm install -g gulp -# displayName: 'Install tools' -# - pwsh: npm run compile -# displayName: 'Compile' -# - pwsh: npm run l10nDevGenerateLocalizationBundle -# displayName: 'Generate bundle.l10.json' -# - pwsh: npm run l10nDevGenerateXlf -# displayName: 'Generate xlf files from bundle.10n.json' -# - task: OneLocBuild@2 -# env: -# SYSTEM_ACCESSTOKEN: $(System.AccessToken) -# inputs: -# locProj: loc/LocProject.json -# outDir: '$(Build.SourcesDirectory)/loc' -# isCreatePrSelected: false -# patVariable: $(dn-bot-ceapex-package-r) -# packageSourceAuth: patAuth -# lclSource: lclFilesfromPackage -# LclPackageId: 'LCL-JUNO-PROD-VSCODECS' -# - pwsh: npm run l10nDevImportXlf -# displayName: 'Import xlf to json.' -# - pwsh: gulp 'publish localization content' --userName dotnet-bot --email dotnet-bot@dotnetfoundation.org --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main' -# displayName: 'Create PR in GitHub.' -# env: -# GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT) \ No newline at end of file + - job: Localization + templateContext: + outputs: + - output: pipelineArtifact + displayName: LOC + targetPath: '$(Build.SourcesDirectory)/loc' + condition: ${{ parameters.publishLocalizationFile }} + artifactName: loc + - output: pipelineArtifact + displayName: l10n + targetPath: '$(Build.SourcesDirectory)/l10n' + condition: ${{ parameters.publishLocalizationFile }} + artifactName: l10n + steps: + - task: NodeTool@0 + displayName: 'Install Node.js 18.x' + inputs: + # Octokit client needs 18.x to have 'fetch' function. + versionSpec: '18.x' + - checkout: self + clean: true + submodules: true + fetchTags: false + fetchDepth: 0 + - pwsh: | + npm install + npm install -g gulp + displayName: 'Install tools' + - pwsh: npm run compile + displayName: 'Compile' + - pwsh: npm run l10nDevGenerateLocalizationBundle + displayName: 'Generate bundle.l10.json' + - pwsh: npm run l10nDevGenerateXlf + displayName: 'Generate xlf files from bundle.10n.json' + - task: OneLocBuild@2 + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: loc/LocProject.json + outDir: '$(Build.SourcesDirectory)/loc' + isCreatePrSelected: false + patVariable: $(dn-bot-ceapex-package-r) + packageSourceAuth: patAuth + lclSource: lclFilesfromPackage + LclPackageId: 'LCL-JUNO-PROD-VSCODECS' + - pwsh: npm run l10nDevImportXlf + displayName: 'Import xlf to json.' + - pwsh: gulp 'publish localization content' --userName dotnet-bot --email dotnet-bot@dotnetfoundation.org --commitSha $(Build.SourceVersion) --targetRemoteRepo vscode-csharp --baseBranch 'main' + displayName: 'Create PR in GitHub.' + env: + GitHubPAT: $(BotAccount-dotnet-bot-repo-PAT) From 0edd01d67a255c36e67fa231a5e8df1037d42c24 Mon Sep 17 00:00:00 2001 From: Shen Chen Date: Fri, 15 Mar 2024 15:48:12 -0700 Subject: [PATCH 16/25] Move to 1ES --- .vscode/settings.json | 3 +-- azure-pipelines/loc.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7797812e7..ccd7bad68 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -20,6 +20,5 @@ "editor.formatOnSave": false, "eslint.lintTask.enable": true, "dotnet.defaultSolution": "disable", - "jest.autoRun": "off", - "azure-pipelines.1ESPipelineTemplatesSchemaFile": true + "jest.autoRun": "off" } diff --git a/azure-pipelines/loc.yml b/azure-pipelines/loc.yml index ad05b942b..fd8cc1189 100644 --- a/azure-pipelines/loc.yml +++ b/azure-pipelines/loc.yml @@ -40,7 +40,7 @@ extends: os: windows stages: - stage: LocalizationStage - # condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') jobs: - job: Localization templateContext: From 40ad2645e03d169d71e358095ec3608a87f178e3 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Mon, 18 Mar 2024 14:42:06 -0700 Subject: [PATCH 17/25] Drop win32-ia32 platform support --- .vscode/launch.json | 6 +- azure-pipelines/release.yml | 16 ++--- .../omnisharpDownloader.test.ts | 12 ++-- .../omnisharpManager.test.ts | 10 --- .../omnisharpPackageCreator.test.ts | 16 ----- .../testAssets/testAssets.ts | 22 ------ package.json | 70 ------------------- src/main.ts | 4 +- tasks/offlinePackagingTasks.ts | 1 - 9 files changed, 14 insertions(+), 143 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index e44ab6f43..19b16c857 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -153,7 +153,7 @@ ], "env": { "NEW_DEPS_ID": "OmniSharp", - "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip", + "NEW_DEPS_URLS": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x86-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-musl-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-linux-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-osx-arm64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x64-net6.0-1.39.11.zip,https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-arm64-net6.0-1.39.11.zip", "OLD_DEPS_VERSION": "1.39.10", "NEW_DEPS_VERSION": "1.39.11", }, @@ -169,7 +169,7 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/85d6dcb5b0164aa042c88d4668d94041/razorlanguageserver-linux-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/6a89b05d4c14a3542789c3ca650018b6/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b37a814188d56ac90f409a6e49098f4f/razorlanguageserver-linux-musl-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/04efb92c455ec620381317a43c480a1b/razorlanguageserver-linux-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/dfdfeadc3ed450706a0d00e057773fc6/razorlanguageserver-osx-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/2d73f9a16d450702b8ac8dbdde142799/razorlanguageserver-osx-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa73364791a8e908ff44a159d1f000d3/razorlanguageserver-platformagnostic-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa38f7d2ee74d0929e47c30d718ac096/razorlanguageserver-win-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fde24d8c856defdccbb652be05bc0fea/razorlanguageserver-win-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/ae634e36d0694be331db134d6c5494e8/razorlanguageserver-win-x86-7.0.0-preview.24161.6.zip", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/85d6dcb5b0164aa042c88d4668d94041/razorlanguageserver-linux-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/6a89b05d4c14a3542789c3ca650018b6/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b37a814188d56ac90f409a6e49098f4f/razorlanguageserver-linux-musl-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/04efb92c455ec620381317a43c480a1b/razorlanguageserver-linux-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/dfdfeadc3ed450706a0d00e057773fc6/razorlanguageserver-osx-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/2d73f9a16d450702b8ac8dbdde142799/razorlanguageserver-osx-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa73364791a8e908ff44a159d1f000d3/razorlanguageserver-platformagnostic-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fa38f7d2ee74d0929e47c30d718ac096/razorlanguageserver-win-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/fde24d8c856defdccbb652be05bc0fea/razorlanguageserver-win-x64-7.0.0-preview.24161.6.zip", "NEW_DEPS_VERSION": "7.0.0-preview.24161.6", "NEW_DEPS_ID": "Razor" }, @@ -185,7 +185,7 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/37c9cbad7a9df0efa17d40da3b8ff303/devkittelemetry-linux-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/782d968486f5324e3ff0c7d5fbc31191/devkittelemetry-linux-musl-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/7fc42bdb835a845efb4ee7cc5cf606d9/devkittelemetry-linux-musl-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b50efac289c46267b8e67318ab840ee4/devkittelemetry-linux-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9f4cdc6489f81ee9d94c218a61bc19a0/devkittelemetry-osx-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/473295a389ea3331c39b6bab7e52d990/devkittelemetry-osx-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9e99d301df6c535a4b5e031fbf3695d4/devkittelemetry-platformagnostic-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/36519b4fb02af42c26e5df12592999cc/devkittelemetry-win-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/c32a8e0f3ef1690f9b76dafabbfa8cae/devkittelemetry-win-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/5bf809c31472e7f6b734540f4f80c5f9/devkittelemetry-win-x86-7.0.0-preview.24161.6.zip", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/37c9cbad7a9df0efa17d40da3b8ff303/devkittelemetry-linux-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/782d968486f5324e3ff0c7d5fbc31191/devkittelemetry-linux-musl-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/7fc42bdb835a845efb4ee7cc5cf606d9/devkittelemetry-linux-musl-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b50efac289c46267b8e67318ab840ee4/devkittelemetry-linux-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9f4cdc6489f81ee9d94c218a61bc19a0/devkittelemetry-osx-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/473295a389ea3331c39b6bab7e52d990/devkittelemetry-osx-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9e99d301df6c535a4b5e031fbf3695d4/devkittelemetry-platformagnostic-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/36519b4fb02af42c26e5df12592999cc/devkittelemetry-win-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/c32a8e0f3ef1690f9b76dafabbfa8cae/devkittelemetry-win-x64-7.0.0-preview.24161.6.zip", "NEW_DEPS_VERSION": "7.0.0-preview.24161.6", "NEW_DEPS_ID": "RazorTelemetry" }, diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml index f258b77e0..4bf1341ac 100644 --- a/azure-pipelines/release.yml +++ b/azure-pipelines/release.yml @@ -71,26 +71,18 @@ stages: Write-Host "Publish to release channel." } $basePublishArgs += '--packagePath' - - # Publish win32-ia32 last as recommended at https://code.visualstudio.com/api/working-with-extensions/publishing-extension#platformspecific-extensions - # Since validation is done asynchronously, we further take care to push the win32 variants in the first batch *first*, - # to give them the longest lead time possible before the second batch with just the win32-ia32 vsix is published. - $nonIA32PlatformArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix -Include *x64*, *arm64* | Sort-Object Name -Descending |% { $_ }) - $ia32PlatformArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix -Include *ia32* | Sort-Object Name -Descending |% { $_ }) + $publishArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix | Sort-Object Name -Descending |% { $_ }) If ("${{ parameters.test }}" -eq "true") { Write-Host "In test mode, command is printed instead of run." - Write-Host "##[command]vsce $nonIA32PlatformArgs" - Write-Host "##[command]vsce $ia32PlatformArgs" + Write-Host "##[command]vsce $publishArgs" Write-Host "🔒 Verify PAT." vsce verify-pat ms-dotnettools } Else { - Write-Host "##[command]vsce $nonIA32PlatformArgs" - vsce @nonIA32PlatformArgs - Write-Host "##[command]vsce $ia32PlatformArgs" - vsce @ia32PlatformArgs + Write-Host "##[command]vsce $publishArgs" + vsce @publishArgs } displayName: 🚀 Publish to Marketplace workingDirectory: $(Pipeline.Workspace) diff --git a/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts b/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts index 07a0ab96e..6cb120494 100644 --- a/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts +++ b/omnisharptest/omnisharpUnitTests/omnisharpDownloader.test.ts @@ -34,7 +34,7 @@ import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator'; const networkSettingsProvider = () => new NetworkSettings('', false); let eventStream: EventStream; const installPath = 'somePath'; - const platformInfo = new PlatformInformation('win32', 'x86'); + const platformInfo = new PlatformInformation('win32', 'x86_64'); let downloader: OmnisharpDownloader; let server: MockHttpsServer; let extensionPath: string; @@ -61,7 +61,7 @@ import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator'; await server.start(); server.addRequestHandler( 'GET', - `/releases/${version}/omnisharp-win-x86${suffix}.zip`, + `/releases/${version}/omnisharp-win-x64${suffix}.zip`, 200, { 'content-type': 'application/zip', @@ -93,19 +93,19 @@ import { modernNetVersion } from '../../src/omnisharp/omnisharpPackageCreator'; test('Events are created', async () => { const expectedSequence = [ new PackageInstallation('OmniSharp Version = 1.2.3'), - new LogPlatformInfo(new PlatformInformation('win32', 'x86')), + new LogPlatformInfo(new PlatformInformation('win32', 'x86_64')), new PackageInstallStart(), new DownloadStart( - `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x86), Version = 1.2.3` + `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x64), Version = 1.2.3` ), new DownloadSizeObtained(testZip.size), new DownloadProgress( 100, - `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x86), Version = 1.2.3` + `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x64), Version = 1.2.3` ), new DownloadSuccess(' Done!'), new InstallationStart( - `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x86), Version = 1.2.3` + `OmniSharp for Windows (.NET ${useFramework ? '4.7.2' : '6'} / x64), Version = 1.2.3` ), new InstallationSuccess(), ]; diff --git a/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts b/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts index df54ac707..93226e665 100644 --- a/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts +++ b/omnisharptest/omnisharpUnitTests/omnisharpManager.test.ts @@ -34,16 +34,6 @@ describe(OmnisharpManager.name, () => { let suffix: string; [ - { - platformInfo: new PlatformInformation('win32', 'x86'), - platformId: 'win-x86', - useFramework: false, - }, - { - platformInfo: new PlatformInformation('win32', 'x86'), - platformId: 'win-x86', - useFramework: true, - }, { platformInfo: new PlatformInformation('win32', 'x86_64'), platformId: 'win-x64', diff --git a/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts b/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts index df9c5e78e..acfd63bc5 100644 --- a/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts +++ b/omnisharptest/omnisharpUnitTests/omnisharpPackageCreator.test.ts @@ -72,22 +72,6 @@ describe('GetOmnisharpPackage : Output package depends on the input package and expect(resultPackage.installPath).toEqual(`experimentPath/1.2.3${pathSuffix}`); }); - test(`Install test path is calculated using specified path, version and ends with OmniSharp.exe or OmniSharp.dll - Windows(x86) ${ - useFramework ? 'on framework' : '' - }`, () => { - const testPackage = inputPackages.find((element) => element.platformId && element.platformId == 'win-x86'); - const resultPackage = SetBinaryAndGetPackage( - testPackage!, - useFramework, - serverUrl, - '1.2.3', - 'experimentPath' - ); - expect(resultPackage.installTestPath).toEqual( - `./experimentPath/1.2.3${pathSuffix}/OmniSharp.${useFramework ? 'exe' : 'dll'}` - ); - }); - test(`Install test path is calculated using specified path, version and ends with OmniSharp.exe or OmniSharp.dll - Windows(x64) ${ useFramework ? 'on framework' : '' }`, () => { diff --git a/omnisharptest/omnisharpUnitTests/testAssets/testAssets.ts b/omnisharptest/omnisharpUnitTests/testAssets/testAssets.ts index aaa96e20b..279c00a68 100644 --- a/omnisharptest/omnisharpUnitTests/testAssets/testAssets.ts +++ b/omnisharptest/omnisharpUnitTests/testAssets/testAssets.ts @@ -5,28 +5,6 @@ export const testPackageJSON = { runtimeDependencies: [ - { - description: 'OmniSharp for Windows (.NET 4.7.2 / x86)', - url: 'https://download.visualstudio.microsoft.com/download/pr/100505823/5804b7d3b5eeb7e4ae812a7cff03bd52/omnisharp-win-x86-1.28.0.zip', - fallbackUrl: 'https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.28.0.zip', - installPath: '.omnisharp', - platforms: ['win32'], - architectures: ['x86'], - installTestPath: './.omnisharp/OmniSharp.exe', - platformId: 'win-x86', - isFramework: true, - }, - { - description: 'OmniSharp for Windows (.NET 6 / x86)', - url: 'https://download.visualstudio.microsoft.com/download/pr/100505823/5804b7d3b5eeb7e4ae812a7cff03bd52/omnisharp-win-x86-1.28.0.zip', - fallbackUrl: 'https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.28.0.zip', - installPath: '.omnisharp', - platforms: ['win32'], - architectures: ['x86'], - installTestPath: './.omnisharp/OmniSharp.exe', - platformId: 'win-x86', - isFramework: false, - }, { description: 'OmniSharp for Windows (.NET 4.7.2 / x64)', url: 'https://download.visualstudio.microsoft.com/download/pr/100505821/c570a9e20dbf7172f79850babd058872/omnisharp-win-x64-1.28.0.zip', diff --git a/package.json b/package.json index fa525e19f..ccc37e25d 100644 --- a/package.json +++ b/package.json @@ -175,38 +175,6 @@ "webpack-cli": "4.6.0" }, "runtimeDependencies": [ - { - "id": "OmniSharp", - "description": "OmniSharp for Windows (.NET 4.7.2 / x86)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-1.39.11.zip", - "installPath": ".omnisharp/1.39.11", - "platforms": [ - "win32" - ], - "architectures": [ - "x86" - ], - "installTestPath": "./.omnisharp/1.39.11/OmniSharp.exe", - "platformId": "win-x86", - "isFramework": true, - "integrity": "DF52F6BCEEF14033E8A8C374EF1B81D223FFD17BA9D7E297CFCF0C4BEBF0A22F" - }, - { - "id": "OmniSharp", - "description": "OmniSharp for Windows (.NET 6 / x86)", - "url": "https://roslynomnisharp.blob.core.windows.net/releases/1.39.11/omnisharp-win-x86-net6.0-1.39.11.zip", - "installPath": ".omnisharp/1.39.11-net6.0", - "platforms": [ - "win32" - ], - "architectures": [ - "x86" - ], - "installTestPath": "./.omnisharp/1.39.11-net6.0/OmniSharp.dll", - "platformId": "win-x86", - "isFramework": false, - "integrity": "BAF991481E56A75E2D865648A212310BB8EB9ACA44BABE64AA284C8E044DC844" - }, { "id": "OmniSharp", "description": "OmniSharp for Windows (.NET 4.7.2 / x64)", @@ -618,19 +586,6 @@ ], "integrity": "102C4A85794380CA6102E1519B81A45528EFC845F007B0A1BF57D18B1044618F" }, - { - "id": "Razor", - "description": "Razor Language Server (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/ae634e36d0694be331db134d6c5494e8/razorlanguageserver-win-x86-7.0.0-preview.24161.6.zip", - "installPath": ".razor", - "platforms": [ - "win32" - ], - "architectures": [ - "x86" - ], - "integrity": "5B926A914DA51D0CEB3924EF9D2CC5FD5D55C9CDB0812C01A3C0FA8C7961DE14" - }, { "id": "Razor", "description": "Razor Language Server (Windows / ARM64)", @@ -768,18 +723,6 @@ "x86_64" ] }, - { - "id": "RazorOmnisharp", - "description": "Razor Language Server for OmniSharp (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/aee63398-023f-48db-bba2-30162c68f0c4/e440c4f3a4a96334fe177513935fa010/razorlanguageserver-win-x86-7.0.0-preview.23363.1.zip", - "installPath": ".razoromnisharp", - "platforms": [ - "win32" - ], - "architectures": [ - "x86" - ] - }, { "id": "RazorOmnisharp", "description": "Razor Language Server for OmniSharp (Windows / ARM64)", @@ -895,19 +838,6 @@ ], "integrity": "EEB71A415D0B1064462EAFF6DAD5451B7EBABF596E0651B1427387A2BA5EFA42" }, - { - "id": "RazorTelemetry", - "description": "Razor Language Server Telemetry (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/5bf809c31472e7f6b734540f4f80c5f9/devkittelemetry-win-x86-7.0.0-preview.24161.6.zip", - "installPath": ".razortelemetry", - "platforms": [ - "win32" - ], - "architectures": [ - "x86" - ], - "integrity": "733B72988371061F45C7749ADCDB4823B7CD6CE6F0ED9C8B8FAE48EEF1E58A7F" - }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / ARM64)", diff --git a/src/main.ts b/src/main.ts index cc882f601..a0989a0c7 100644 --- a/src/main.ts +++ b/src/main.ts @@ -447,9 +447,7 @@ function profferBrokeredServices( function isSupportedPlatform(platform: PlatformInformation): boolean { if (platform.isWindows()) { - return ( - platform.architecture === 'x86' || platform.architecture === 'x86_64' || platform.architecture === 'arm64' - ); + return platform.architecture === 'x86_64' || platform.architecture === 'arm64'; } if (platform.isMacOS()) { diff --git a/tasks/offlinePackagingTasks.ts b/tasks/offlinePackagingTasks.ts index b060dbd66..3b38554d7 100644 --- a/tasks/offlinePackagingTasks.ts +++ b/tasks/offlinePackagingTasks.ts @@ -43,7 +43,6 @@ interface VSIXPlatformInfo { // Mapping of vsce vsix packaging target to the RID used to build the server executable export const platformSpecificPackages: VSIXPlatformInfo[] = [ { vsceTarget: 'win32-x64', rid: 'win-x64', platformInfo: new PlatformInformation('win32', 'x86_64') }, - { vsceTarget: 'win32-ia32', rid: 'win-x86', platformInfo: new PlatformInformation('win32', 'x86') }, { vsceTarget: 'win32-arm64', rid: 'win-arm64', platformInfo: new PlatformInformation('win32', 'arm64') }, { vsceTarget: 'linux-x64', rid: 'linux-x64', platformInfo: new PlatformInformation('linux', 'x86_64') }, { vsceTarget: 'linux-arm64', rid: 'linux-arm64', platformInfo: new PlatformInformation('linux', 'arm64') }, From c02d2dc1d29ae30fa4025539df797244f41829a8 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Thu, 14 Mar 2024 11:25:35 -0700 Subject: [PATCH 18/25] Migrate official build to 1es templates --- azure-pipelines-official.yml | 44 +++++-- azure-pipelines.yml | 2 + azure-pipelines/build-all.yml | 84 +++++++++++- azure-pipelines/build.yml | 82 +++++------- azure-pipelines/release.yml | 240 +++++++++++++++++++--------------- 5 files changed, 276 insertions(+), 176 deletions(-) diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml index e3a39e7c7..cd76ef3d0 100644 --- a/azure-pipelines-official.yml +++ b/azure-pipelines-official.yml @@ -5,17 +5,39 @@ trigger: - release - prerelease pr: none - parameters: - # Allows the version number to be set manually for a specific build. - # Useful when we need to create an updated extension version with no changes (for example to fix a bad partial release). - - name: versionNumberOverride - type: string - default: 'default' +# Allows the version number to be set manually for a specific build. +# Useful when we need to create an updated extension version with no changes (for example to fix a bad partial release). +- name: versionNumberOverride + type: string + default: 'default' +# Allows the marketplace release channel to be set manually for a specific build +# Auto will determine the release channel based on the branch. +- name: channel + values: + - release + - prerelease + - auto + default: auto -stages: -- template: azure-pipelines/build-all.yml +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates parameters: - versionNumberOverride: ${{ parameters.versionNumberOverride }} - -# TODO: add compliance, signing. \ No newline at end of file + pool: + name: netcore1espool-internal + image: 1es-windows-2022-pt + os: windows + customBuildTags: + - ES365AIMigrationTooling + stages: + - template: /azure-pipelines/build-all.yml@self + parameters: + versionNumberOverride: ${{ parameters.versionNumberOverride }} + isOfficial: true + channel: ${{ parameters.channel }} \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8bfc29546..299169b96 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,6 +15,8 @@ pr: stages: - template: azure-pipelines/build-all.yml + parameters: + isOfficial: false - stage: Test displayName: Test diff --git a/azure-pipelines/build-all.yml b/azure-pipelines/build-all.yml index 459c60c9b..1c608742a 100644 --- a/azure-pipelines/build-all.yml +++ b/azure-pipelines/build-all.yml @@ -2,24 +2,94 @@ parameters: - name: versionNumberOverride type: string default: 'default' - +- name: isOfficial + type: boolean +- name: channel + values: + - release + - prerelease + - auto + default: auto stages: - stage: Build displayName: 'Build VSIXs' dependsOn: [] jobs: - - template: build.yml + - job: SetChannelVariable + displayName: 'Set Channel Variable' + pool: + ${{ if eq(parameters.isOfficial, true) }}: + name: netcore1espool-internal + image: 1es-ubuntu-2204-pt + ${{ else }}: + name: Azure Pipelines + vmImage: ubuntu-latest + os: linux + steps: + - pwsh: | + $isPrerelease = $true + if ("${{ parameters.channel }}" -eq "release") { + Write-Host "Channel override set to release, using release channel." + $isPrerelease = $false + } elseif ("${{ parameters.channel }}" -eq "prerelease") { + Write-Host "Channel override set to prerelease, using prerelease channel." + $isPrerelease = $true + } else { + Write-Host "Channel override is ${{ parameters.channel }}, using branch configuration to determine release channel." + Write-Host "Detected branch $(Build.SourceBranchName)" + if ("$(Build.SourceBranchName)" -eq "release") { + Write-Host "Branch is release, using release channel." + $isPrerelease = $false + } else { + Write-Host "Branch is not release, using prerelease channel." + $isPrerelease = $true + } + } + + if ( $isPrerelease ) { + Write-Host "Setting pipeline channel variable to Prerelease." + Write-Host "##vso[task.setvariable variable=channel;isoutput=true]Prerelease" + } else { + Write-Host "Setting pipeline channel variable to Release." + Write-Host "##vso[task.setvariable variable=channel;isoutput=true]Release" + } + name: passOutput + + - template: /azure-pipelines/build.yml@self parameters: versionNumberOverride: ${{ parameters.versionNumberOverride }} - vmImageName: ubuntu-latest platform: linux - - template: build.yml + isOfficial: ${{ parameters.isOfficial }} + pool: + ${{ if eq(parameters.isOfficial, true) }}: + name: netcore1espool-internal + image: 1es-ubuntu-2204-pt + ${{ else }}: + name: Azure Pipelines + vmImage: ubuntu-latest + os: linux + - template: /azure-pipelines/build.yml@self parameters: versionNumberOverride: ${{ parameters.versionNumberOverride }} - vmImageName: windows-latest platform: windows - - template: build.yml + isOfficial: ${{ parameters.isOfficial }} + pool: + ${{ if eq(parameters.isOfficial, true) }}: + name: netcore1espool-internal + image: 1es-windows-2022-pt + ${{ else }}: + name: Azure Pipelines + vmImage: windows-latest + os: windows + - template: /azure-pipelines/build.yml@self parameters: versionNumberOverride: ${{ parameters.versionNumberOverride }} - vmImageName: macOS-latest platform: darwin + isOfficial: ${{ parameters.isOfficial }} + pool: + name: Azure Pipelines + ${{ if eq(parameters.isOfficial, true) }}: + image: macOS-latest + ${{ else }}: + vmImage: macOS-latest + os: macOS diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index d99dbd29a..07f83288a 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -2,68 +2,52 @@ parameters: - name: versionNumberOverride type: string default: 'default' -- name: vmImageName - type: string - default: '' - name: platform type: string +- name: pool + type: object +- name: isOfficial + type: boolean jobs: -- job: - displayName: 'Build ${{ parameters.platform }} prerelease vsixs' - pool: - name: Azure Pipelines - vmImage: ${{ parameters.vmImageName }} - steps: - - checkout: self - clean: true - submodules: true - fetchTags: false - fetchDepth: 0 - - - template: prereqs.yml - parameters: - versionNumberOverride: ${{ parameters.versionNumberOverride }} - - - script: gulp vsix:release:package:${{ parameters.platform }} --prerelease - displayName: 'Build VSIXs' - - - task: PublishBuildArtifacts@1 - condition: succeeded() - displayName: 'Publish VSIXs' - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/vsix' - ArtifactName: 'VSIX_Prerelease' - - - script: npm run test:artifacts - displayName: 'Run artifacts tests' - -- job: - displayName: 'Build ${{ parameters.platform }} release vsixs' - pool: - name: Azure Pipelines - vmImage: ${{ parameters.vmImageName }} +- job: 'Build_${{ parameters.platform }}_vsixs' + pool: ${{ parameters.pool }} + displayName: 'Build ${{ parameters.platform }} vsixs' + dependsOn: SetChannelVariable + variables: + channel: $[ dependencies.SetChannelVariable.outputs['passOutput.channel'] ] steps: - checkout: self clean: true submodules: true fetchTags: false fetchDepth: 0 - - - template: prereqs.yml + - template: /azure-pipelines/prereqs.yml@self parameters: versionNumberOverride: ${{ parameters.versionNumberOverride }} - - - script: gulp vsix:release:package:${{ parameters.platform }} + - pwsh: | + Write-Host "Building VSIXs for platform ${{ parameters.platform }} and channel $(channel)" + if ("$(channel)" -eq "Release") { + gulp vsix:release:package:${{ parameters.platform }} + } else { + gulp vsix:release:package:${{ parameters.platform }} --prerelease + } displayName: 'Build VSIXs' - - task: PublishBuildArtifacts@1 - condition: succeeded() - displayName: 'Publish VSIXs' - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/vsix' - ArtifactName: 'VSIX_Release' + - ${{ if eq(parameters.isOfficial, true) }}: + - task: 1ES.PublishBuildArtifacts@1 + condition: succeeded() + displayName: 'Publish VSIXs' + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/vsix' + ArtifactName: 'VSIX_$(channel)' + - ${{ else }}: + - task: PublishBuildArtifacts@1 + condition: succeeded() + displayName: 'Publish VSIXs' + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/vsix' + ArtifactName: 'VSIX_$(channel)' - script: npm run test:artifacts - displayName: 'Run artifacts tests' - \ No newline at end of file + displayName: 'Run artifacts tests' \ No newline at end of file diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml index f258b77e0..846d9e580 100644 --- a/azure-pipelines/release.yml +++ b/azure-pipelines/release.yml @@ -1,19 +1,10 @@ trigger: none pr: none -resources: - pipelines: - - pipeline: officialBuildCI - source: dotnet-vscode-csharp - branch: main - parameters: - name: test type: boolean default: true - - name: uploadPrerelease - type: boolean - default: true variables: # This is expected to provide VisualStudioMarketplacePAT to the release (https://code.visualstudio.com/api/working-with-extensions/publishing-extension#get-a-personal-access-token) @@ -21,111 +12,142 @@ variables: # This is expected to provide pat to tag release. - group: DncEng-Partners-Tokens -stages: -- stage: PublishStage - jobs: - - deployment: PublishToMarketplace - displayName: PublishToMarketplace - environment: vscode-csharp-release-approvals +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + pipelines: + - pipeline: officialBuildCI + source: dotnet-vscode-csharp + branch: main +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates + parameters: pool: - vmImage: ubuntu-latest - strategy: - runOnce: - deploy: - steps: - - download: 'none' - - task: DownloadPipelineArtifact@2 - displayName: '📦 Download artifacts from build pipeline.' - inputs: - buildType: 'specific' - project: 'internal' - definition: 1264 - buildVersionToDownload: 'specific' - buildId: '$(resources.pipeline.officialBuildCI.runID)' - branchName: '$(resources.pipeline.officialBuildCI.sourceBranch)' - - pwsh: | - npm install --global vsce - displayName: 'Install vsce' - - pwsh: | - $artifactFolder = "VSIX_Release" - if ("${{ parameters.uploadPrerelease }}" -eq "true") { - $artifactFolder = "VSIX_Prerelease" - } + name: netcore1espool-internal + image: 1es-windows-2022-pt + os: windows + customBuildTags: + - ES365AIMigrationTooling + stages: + - stage: PublishStage + jobs: + - deployment: PublishToMarketplace + displayName: PublishToMarketplace + environment: vscode-csharp-release-approvals + pool: + name: netcore1espool-internal + image: 1es-ubuntu-2204-pt + os: linux + strategy: + runOnce: + deploy: + steps: + - download: 'none' + - task: DownloadPipelineArtifact@2 + displayName: '📦 Download artifacts from build pipeline.' + inputs: + buildType: 'specific' + project: 'internal' + definition: 1264 + buildVersionToDownload: 'specific' + buildId: '$(resources.pipeline.officialBuildCI.runID)' + branchName: '$(resources.pipeline.officialBuildCI.sourceBranch)' + - pwsh: | + npm install --global vsce + displayName: 'Install vsce' + - pwsh: | + # Choose whether to upload to prerelease or release based on the artifacts generated by the build pipeline. + $artifactFolder = "" + $uploadPrerelease = $true + if (Test-Path -Path "VSIX_Prerelease") { + $artifactFolder = "VSIX_Prerelease" + $uploadPrerelease = $true + } elseif (Test-Path -Path "VSIX_Release") { + $artifactFolder = "VSIX_Release" + $uploadPrerelease = $false + } else { + throw "No artifacts are downloaded." + } - Write-Host "Using artifacts from $artifactFolder" + Write-Host "Uploading artifacts from $artifactFolder with prerelease=$uploadPrerelease" - # Our build pipeline would generated build based on attempt number. Publishing the latest attempt. - $allArtifacts = Get-ChildItem -Path "$artifactFolder*" | Sort-Object -Descending - if ($allArtifacts.Length -eq 0) { - throw "No Artifacts is downloaded." - } + # Our build pipeline would generated build based on attempt number. Publishing the latest attempt. + $allArtifacts = Get-ChildItem -Path "$artifactFolder*" | Sort-Object -Descending + if ($allArtifacts.Length -eq 0) { + throw "No artifacts in $artifactFolder" + } - $publishArtifacts = $allArtifacts[0] - Write-Host "All artifacts: $($allArtifacts). Publishing $($publishArtifacts)." + $publishArtifacts = $allArtifacts[0] + Write-Host "All artifacts: $($allArtifacts). Publishing $($publishArtifacts)." - $basePublishArgs = , "publish" - If ("${{ parameters.uploadPrerelease }}" -eq "true") { - $basePublishArgs += "--pre-release" - Write-Host "Publish to pre-release channel." - } Else { - Write-Host "Publish to release channel." - } - $basePublishArgs += '--packagePath' + $basePublishArgs = , "publish" + If ( $uploadPrerelease ) { + $basePublishArgs += "--pre-release" + Write-Host "Publish to pre-release channel." + } Else { + Write-Host "Publish to release channel." + } + $basePublishArgs += '--packagePath' - # Publish win32-ia32 last as recommended at https://code.visualstudio.com/api/working-with-extensions/publishing-extension#platformspecific-extensions - # Since validation is done asynchronously, we further take care to push the win32 variants in the first batch *first*, - # to give them the longest lead time possible before the second batch with just the win32-ia32 vsix is published. - $nonIA32PlatformArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix -Include *x64*, *arm64* | Sort-Object Name -Descending |% { $_ }) - $ia32PlatformArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix -Include *ia32* | Sort-Object Name -Descending |% { $_ }) + # Publish win32-ia32 last as recommended at https://code.visualstudio.com/api/working-with-extensions/publishing-extension#platformspecific-extensions + # Since validation is done asynchronously, we further take care to push the win32 variants in the first batch *first*, + # to give them the longest lead time possible before the second batch with just the win32-ia32 vsix is published. + $nonIA32PlatformArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix -Include *x64*, *arm64* | Sort-Object Name -Descending |% { $_ }) + $ia32PlatformArgs = $basePublishArgs + (Get-ChildItem $publishArtifacts\*.vsix -Include *ia32* | Sort-Object Name -Descending |% { $_ }) - If ("${{ parameters.test }}" -eq "true") { - Write-Host "In test mode, command is printed instead of run." - Write-Host "##[command]vsce $nonIA32PlatformArgs" - Write-Host "##[command]vsce $ia32PlatformArgs" + If ("${{ parameters.test }}" -eq "true") { + Write-Host "In test mode, command is printed instead of run." + Write-Host "##[command]vsce $nonIA32PlatformArgs" + Write-Host "##[command]vsce $ia32PlatformArgs" - Write-Host "🔒 Verify PAT." - vsce verify-pat ms-dotnettools - } - Else { - Write-Host "##[command]vsce $nonIA32PlatformArgs" - vsce @nonIA32PlatformArgs - Write-Host "##[command]vsce $ia32PlatformArgs" - vsce @ia32PlatformArgs - } - displayName: 🚀 Publish to Marketplace - workingDirectory: $(Pipeline.Workspace) - env: - VSCE_PAT: $(VSCodeMarketplacePAT) -- stage: 'TagRelease' - displayName: 'Tag release of vscode-csharp' - dependsOn: 'PublishStage' - condition: succeeded('PublishStage') - jobs: - - job: 'Tag' - pool: - vmImage: ubuntu-latest - steps: - - task: NodeTool@0 - displayName: 'Install Node.js 18.x' - inputs: - versionSpec: '18.x' - - checkout: self - clean: true - submodules: true - fetchTags: false - fetchDepth: 0 - - pwsh: | - git checkout $(resources.pipeline.officialBuildCI.sourceCommit) - displayName: 'Checkout build source branch' - - pwsh: | - npm ci - npm install - npm install -g gulp - gulp installDependencies - displayName: 'Install dependencies.' - - pwsh: | - # build number is generated by nerdbank git versioning and set to AzureDev - gulp createTags --releaseVersion $(resources.pipeline.officialBuildCI.runName) --releaseCommit $(resources.pipeline.officialBuildCI.sourceCommit) --dryRun ${{ parameters.test }} - env: - GitHubPAT: $(BotAccount-dotnet-bot-content-rw-grained-pat) - displayName: 'Create release tags' + Write-Host "🔒 Verify PAT." + vsce verify-pat ms-dotnettools + } + Else { + Write-Host "##[command]vsce $nonIA32PlatformArgs" + vsce @nonIA32PlatformArgs + Write-Host "##[command]vsce $ia32PlatformArgs" + vsce @ia32PlatformArgs + } + displayName: 🚀 Publish to Marketplace + workingDirectory: $(Pipeline.Workspace) + env: + VSCE_PAT: $(VSCodeMarketplacePAT) + - stage: 'TagRelease' + displayName: 'Tag release of vscode-csharp' + dependsOn: 'PublishStage' + condition: succeeded('PublishStage') + jobs: + - job: 'Tag' + pool: + name: netcore1espool-internal + image: 1es-ubuntu-2204-pt + os: linux + steps: + - task: NodeTool@0 + displayName: 'Install Node.js 18.x' + inputs: + versionSpec: '18.x' + - checkout: self + clean: true + submodules: true + fetchTags: false + fetchDepth: 0 + - pwsh: | + git checkout $(resources.pipeline.officialBuildCI.sourceCommit) + displayName: 'Checkout build source branch' + - pwsh: | + npm ci + npm install + npm install -g gulp + gulp installDependencies + displayName: 'Install dependencies.' + - pwsh: | + # build number is generated by nerdbank git versioning and set to AzureDev + gulp createTags --releaseVersion $(resources.pipeline.officialBuildCI.runName) --releaseCommit $(resources.pipeline.officialBuildCI.sourceCommit) --dryRun ${{ parameters.test }} + env: + GitHubPAT: $(BotAccount-dotnet-bot-content-rw-grained-pat) + displayName: 'Create release tags' From 93839e6986efed0a431aaba40bdf5acec90c67b8 Mon Sep 17 00:00:00 2001 From: Andrew Hall Date: Mon, 18 Mar 2024 20:12:03 -0700 Subject: [PATCH 19/25] Bump version --- .vscode/launch.json | 4 ++-- package.json | 46 ++++++++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 11e5d62a6..69bf8e499 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -169,8 +169,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/57a8b1dc12af90bdc1b8e0036d4b5cf8/razorlanguageserver-linux-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b59d0eb28baf935dcb81dc1aa91b8b37/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b6de6303a02473ba8fbe4d127d3d0827/razorlanguageserver-linux-musl-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/a9c955bc5b09ee22f82309ec821ea630/razorlanguageserver-linux-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/0ad87856a78cf034b5e30423f51f42ca/razorlanguageserver-osx-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/d7dbdd01e9d1fc74e44de8bf5c2c3cf4/razorlanguageserver-osx-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/2d81ded18f0c7efa1c7e37489093a613/razorlanguageserver-platformagnostic-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/3f8fd08587afa3b615886dd745723497/razorlanguageserver-win-arm64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/5d025f318cb834236a06439eb37ce889/razorlanguageserver-win-x64-7.0.0-preview.23627.2.zip,https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/adb8c2855e48de8cdd7e39eb669583fd/razorlanguageserver-win-x86-7.0.0-preview.23627.2.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.23627.2", + "NEW_DEPS_URLS": " https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b6fa76f8ccfa8053f56f1fa3d39e78c9/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/97b57265a3097b6128aaa4be297f1243/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/fdf85820363515f55ce0f4e35a7fe780/razorlanguageserver-linux-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/48d3bef6b7f06634e53ca433be40e52a/razorlanguageserver-osx-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/581c065f415941a97c7687403da5d61c/razorlanguageserver-osx-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b2940e8871ef222b0bc820b51ec44ed2/razorlanguageserver-platformagnostic-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bbc8d2a30ba7da4e0eb4465a329b1fa1/razorlanguageserver-win-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/dc3bfe5f9473a09cb823d665193d4ff0/razorlanguageserver-win-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/7ff9016973253dd93fa52aff5d631aa5/razorlanguageserver-win-x86-7.0.0-preview.24168.4.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.24168.3", "NEW_DEPS_ID": "Razor" }, "cwd": "${workspaceFolder}" diff --git a/package.json b/package.json index be663d215..e4756e700 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,9 @@ } }, "defaults": { - "roslyn": "4.10.0-2.24102.11", + "roslyn": "4.10.0-3.24168.7", "omniSharp": "1.39.11", - "razor": "7.0.0-preview.23627.2", + "razor": "7.0.0-preview.24168.3", "razorOmnisharp": "7.0.0-preview.23363.1", "razorTelemetry": "7.0.0-preview.23627.2" }, @@ -608,7 +608,7 @@ { "id": "Razor", "description": "Razor Language Server (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/5d025f318cb834236a06439eb37ce889/razorlanguageserver-win-x64-7.0.0-preview.23627.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/02a9c93c5bc82b70996f5156243ee8f3/razorlanguageserver-win-x64-7.0.0-preview.24168.3.zip", "installPath": ".razor", "platforms": [ "win32" @@ -616,12 +616,12 @@ "architectures": [ "x86_64" ], - "integrity": "C4868EDA9D4E004FD97B5498B471C6B866E32242E6F829C7945DF206C6132C63" + "integrity": "9E0371C291AACB7AEF6578FE39BBAB78B9006E247C6EA49A8FB66EA8CCD8F152" }, { "id": "Razor", "description": "Razor Language Server (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/adb8c2855e48de8cdd7e39eb669583fd/razorlanguageserver-win-x86-7.0.0-preview.23627.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/918f13e77424254801d2cfc619705c0d/razorlanguageserver-win-x86-7.0.0-preview.24168.3.zip", "installPath": ".razor", "platforms": [ "win32" @@ -629,12 +629,12 @@ "architectures": [ "x86" ], - "integrity": "57788B1E123D9099EC7B7A800532F81FFA05A7555073606417BED9F2A9FC0722" + "integrity": "AEF2B4011CCC18F3423D5576AA5A9B84195E25404E7FEC33644CFAE995B3476F" }, { "id": "Razor", "description": "Razor Language Server (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/3f8fd08587afa3b615886dd745723497/razorlanguageserver-win-arm64-7.0.0-preview.23627.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/f91126edb487118e6f63bfb105dc954b/razorlanguageserver-win-arm64-7.0.0-preview.24168.3.zip", "installPath": ".razor", "platforms": [ "win32" @@ -642,12 +642,12 @@ "architectures": [ "arm64" ], - "integrity": "E9CFA28A88E48D1A15208B4466E46E82F61CFF3A395C270AE28DBE535882C578" + "integrity": "BD557971ABD194C5A3E896EABFE7CAAD9A0F5FFF5D73E10A3A58E4C206688A5E" }, { "id": "Razor", "description": "Razor Language Server (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/a9c955bc5b09ee22f82309ec821ea630/razorlanguageserver-linux-x64-7.0.0-preview.23627.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/005bf5f914f0375be5073a16b72e69fc/razorlanguageserver-linux-x64-7.0.0-preview.24168.3.zip", "installPath": ".razor", "platforms": [ "linux" @@ -658,12 +658,12 @@ "binaries": [ "./rzls" ], - "integrity": "F69C8C28080D6B93367856CC084B65A719EF7F6F66DBA7521520D84824147EBC" + "integrity": "BCA28B44940DBA0087FC8E51CC4F67970BFB162B73C53B851772958D0FFF6930" }, { "id": "Razor", "description": "Razor Language Server (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/57a8b1dc12af90bdc1b8e0036d4b5cf8/razorlanguageserver-linux-arm64-7.0.0-preview.23627.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/19b5104c27627401dc0abcf0b9c9ffd2/razorlanguageserver-linux-arm64-7.0.0-preview.24168.3.zip", "installPath": ".razor", "platforms": [ "linux" @@ -674,12 +674,12 @@ "binaries": [ "./rzls" ], - "integrity": "ED6CE8A36F6C0CF77E1012B03078BE745D3F7045EB8A71FAA31D32E948591692" + "integrity": "D4E39C61CADA862CB89FBF39926105BE30D7E8718F66B190CE1F5D7527783FD9" }, { "id": "Razor", "description": "Razor Language Server (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b6de6303a02473ba8fbe4d127d3d0827/razorlanguageserver-linux-musl-x64-7.0.0-preview.23627.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/d9cd8892894eb4e40899dbe73c056afa/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.3.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -690,12 +690,12 @@ "binaries": [ "./rzls" ], - "integrity": "A7FC04E2FA595EA722C6F792989D10127DBE5F3F9F783C54DDB71654BA011298" + "integrity": "A5EE72C16B2B0D9D3C920CFD66EC56EB6E30A381C3E16BD13C42A456DA774F27" }, { "id": "Razor", "description": "Razor Language Server (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/b59d0eb28baf935dcb81dc1aa91b8b37/razorlanguageserver-linux-musl-arm64-7.0.0-preview.23627.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/7d63da59dc1b4958389e0f1786fb732c/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.3.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -706,12 +706,12 @@ "binaries": [ "./rzls" ], - "integrity": "FF6B50056B128F675A29D89496328BF473929298FC83C06CEE387C15A698CBB5" + "integrity": "BD5A0BED97E9809154A117948621FAB3ADB3B19A7130120512196E8C2EB7A7C8" }, { "id": "Razor", "description": "Razor Language Server (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/d7dbdd01e9d1fc74e44de8bf5c2c3cf4/razorlanguageserver-osx-x64-7.0.0-preview.23627.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/b6920b1e1aab7d8480226a844713ea73/razorlanguageserver-osx-x64-7.0.0-preview.24168.3.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -722,12 +722,12 @@ "binaries": [ "./rzls" ], - "integrity": "849FE69AA1012F65F66E402129D5934BEE363DB9D119A139AB8EF60FCC35CB03" + "integrity": "8011818F564B66B0171BF5B3D2B2897B9A3665155925A91A423B151547EDAF6D" }, { "id": "Razor", "description": "Razor Language Server (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/0ad87856a78cf034b5e30423f51f42ca/razorlanguageserver-osx-arm64-7.0.0-preview.23627.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/bf46f3aae423b8ecf6862c4663b15f96/razorlanguageserver-osx-arm64-7.0.0-preview.24168.3.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -738,12 +738,12 @@ "binaries": [ "./rzls" ], - "integrity": "AEF2F022652082D044F1CDB873F78701DAB3054DC9537ADA94527EC7A9D8F292" + "integrity": "952533B38C201EEAEB6CB4CF477A515E6C6B6A8A54B9AD45FC9272A109E3AEFA" }, { "id": "Razor", "description": "Razor Language Server (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/9e436821-9ad7-4d14-81bd-69a8ab07838f/2d81ded18f0c7efa1c7e37489093a613/razorlanguageserver-platformagnostic-7.0.0-preview.23627.2.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/bf5a5ff99adf3379daafe74e52b90b81/razorlanguageserver-platformagnostic-7.0.0-preview.24168.3.zip", "installPath": ".razor", "platforms": [ "neutral" @@ -754,7 +754,7 @@ "binaries": [ "./rzls" ], - "integrity": "D630874B6235B49D42219A3F22C84C5D25120BCD60ACEEA5D8ED4F14743A9BE1" + "integrity": "05C080F35CF235B2E319783CF321A8F86AD7EAFC4003DADD211DE3077CB849FD" }, { "id": "RazorOmnisharp", @@ -5691,4 +5691,4 @@ } ] } -} +} \ No newline at end of file From 055166427fbb083c0a3607ebd7bdbe257b11294f Mon Sep 17 00:00:00 2001 From: MerlinBot Date: Mon, 18 Mar 2024 18:41:19 +0000 Subject: [PATCH 20/25] Updated for https://dev.azure.com/dnceng/7ea9116e-9fac-403d-b258-b31fcf1bb293/_build?definitionId=1275 by using baselines generated in https://dev.azure.com/dnceng/7ea9116e-9fac-403d-b258-b31fcf1bb293/_build/results?buildId=2407347 --- .../1espt/PipelineAutobaseliningConfig.yml | 17 +++++++++++ .config/guardian/.gdnbaselines | 29 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 .config/1espt/PipelineAutobaseliningConfig.yml create mode 100644 .config/guardian/.gdnbaselines diff --git a/.config/1espt/PipelineAutobaseliningConfig.yml b/.config/1espt/PipelineAutobaseliningConfig.yml new file mode 100644 index 000000000..40968f9f6 --- /dev/null +++ b/.config/1espt/PipelineAutobaseliningConfig.yml @@ -0,0 +1,17 @@ +## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details. + +pipelines: + 1275: + retail: + source: + credscan: + lastModifiedDate: 2024-03-18 + eslint: + lastModifiedDate: 2024-03-18 + armory: + lastModifiedDate: 2024-03-18 + binary: + credscan: + lastModifiedDate: 2024-03-18 + binskim: + lastModifiedDate: 2024-03-18 diff --git a/.config/guardian/.gdnbaselines b/.config/guardian/.gdnbaselines new file mode 100644 index 000000000..027be596a --- /dev/null +++ b/.config/guardian/.gdnbaselines @@ -0,0 +1,29 @@ +{ + "properties": { + "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines" + }, + "version": "1.0.0", + "baselines": { + "default": { + "name": "default", + "createdDate": "2024-03-18 18:32:58Z", + "lastUpdatedDate": "2024-03-18 18:32:58Z" + } + }, + "results": { + "d6ffb0614846153cf3cc5936d0444ed9eda6fe6854febb4c8ea59243c120b223": { + "signature": "d6ffb0614846153cf3cc5936d0444ed9eda6fe6854febb4c8ea59243c120b223", + "alternativeSignatures": [], + "target": "omnisharptest/omnisharpUnitTests/testAssets/private.pem", + "line": 1, + "memberOf": [ + "default" + ], + "tool": "credscan", + "ruleId": "CSCAN-GENERAL0020", + "createdDate": "2024-03-18 18:32:58Z", + "expirationDate": "2024-09-04 18:41:17Z", + "justification": "This error is baselined with an expiration date of 180 days from 2024-03-18 18:41:17Z" + } + } +} \ No newline at end of file From 027d777c33de9f421b9388418d90d9c1a94fcd79 Mon Sep 17 00:00:00 2001 From: MerlinBot Date: Mon, 18 Mar 2024 18:44:24 +0000 Subject: [PATCH 21/25] Updated for https://dev.azure.com/dnceng/7ea9116e-9fac-403d-b258-b31fcf1bb293/_build?definitionId=1275 by using baselines generated in https://dev.azure.com/dnceng/7ea9116e-9fac-403d-b258-b31fcf1bb293/_build/results?buildId=2407366 --- .config/guardian/.gdnbaselines | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/guardian/.gdnbaselines b/.config/guardian/.gdnbaselines index 027be596a..986942231 100644 --- a/.config/guardian/.gdnbaselines +++ b/.config/guardian/.gdnbaselines @@ -21,9 +21,9 @@ ], "tool": "credscan", "ruleId": "CSCAN-GENERAL0020", - "createdDate": "2024-03-18 18:32:58Z", - "expirationDate": "2024-09-04 18:41:17Z", - "justification": "This error is baselined with an expiration date of 180 days from 2024-03-18 18:41:17Z" + "createdDate": "2024-03-18 18:43:05Z", + "expirationDate": "2024-09-04 18:44:23Z", + "justification": "This error is baselined with an expiration date of 180 days from 2024-03-18 18:44:23Z" } } } \ No newline at end of file From ba39b31921a0c4540b5f066b7916fba230083ee5 Mon Sep 17 00:00:00 2001 From: MerlinBot Date: Tue, 19 Mar 2024 18:18:30 +0000 Subject: [PATCH 22/25] Updated for https://dev.azure.com/dnceng/7ea9116e-9fac-403d-b258-b31fcf1bb293/_build?definitionId=1264 by using baselines generated in https://dev.azure.com/dnceng/7ea9116e-9fac-403d-b258-b31fcf1bb293/_build/results?buildId=2408361 --- .config/1espt/PipelineAutobaseliningConfig.yml | 18 ++++++++++++++++++ .config/guardian/.gdnbaselines | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.config/1espt/PipelineAutobaseliningConfig.yml b/.config/1espt/PipelineAutobaseliningConfig.yml index 40968f9f6..4b570e4e9 100644 --- a/.config/1espt/PipelineAutobaseliningConfig.yml +++ b/.config/1espt/PipelineAutobaseliningConfig.yml @@ -15,3 +15,21 @@ pipelines: lastModifiedDate: 2024-03-18 binskim: lastModifiedDate: 2024-03-18 + 1264: + retail: + source: + credscan: + lastModifiedDate: 2024-03-19 + eslint: + lastModifiedDate: 2024-03-19 + psscriptanalyzer: + lastModifiedDate: 2024-03-19 + armory: + lastModifiedDate: 2024-03-19 + binary: + credscan: + lastModifiedDate: 2024-03-19 + binskim: + lastModifiedDate: 2024-03-19 + spotbugs: + lastModifiedDate: 2024-03-19 diff --git a/.config/guardian/.gdnbaselines b/.config/guardian/.gdnbaselines index 986942231..032643c03 100644 --- a/.config/guardian/.gdnbaselines +++ b/.config/guardian/.gdnbaselines @@ -21,9 +21,9 @@ ], "tool": "credscan", "ruleId": "CSCAN-GENERAL0020", - "createdDate": "2024-03-18 18:43:05Z", - "expirationDate": "2024-09-04 18:44:23Z", - "justification": "This error is baselined with an expiration date of 180 days from 2024-03-18 18:44:23Z" + "createdDate": "2024-03-19 17:56:07Z", + "expirationDate": "2024-09-05 18:18:29Z", + "justification": "This error is baselined with an expiration date of 180 days from 2024-03-19 18:18:29Z" } } } \ No newline at end of file From eb0d128bc8999ff8baae80e7c025bb1d28cea03f Mon Sep 17 00:00:00 2001 From: Andrew Hall Date: Tue, 19 Mar 2024 14:29:45 -0700 Subject: [PATCH 23/25] Actually update packages --- .vscode/launch.json | 6 ++-- package.json | 86 ++++++++++++++++++++++----------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index a6b7755f1..f1ca15a9c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -169,7 +169,7 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": " https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b6fa76f8ccfa8053f56f1fa3d39e78c9/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/97b57265a3097b6128aaa4be297f1243/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/fdf85820363515f55ce0f4e35a7fe780/razorlanguageserver-linux-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/48d3bef6b7f06634e53ca433be40e52a/razorlanguageserver-osx-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/581c065f415941a97c7687403da5d61c/razorlanguageserver-osx-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b2940e8871ef222b0bc820b51ec44ed2/razorlanguageserver-platformagnostic-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bbc8d2a30ba7da4e0eb4465a329b1fa1/razorlanguageserver-win-arm64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/dc3bfe5f9473a09cb823d665193d4ff0/razorlanguageserver-win-x64-7.0.0-preview.24168.4.zip, https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/7ff9016973253dd93fa52aff5d631aa5/razorlanguageserver-win-x86-7.0.0-preview.24168.4.zip", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b6fa76f8ccfa8053f56f1fa3d39e78c9/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/97b57265a3097b6128aaa4be297f1243/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/fdf85820363515f55ce0f4e35a7fe780/razorlanguageserver-linux-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/48d3bef6b7f06634e53ca433be40e52a/razorlanguageserver-osx-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/581c065f415941a97c7687403da5d61c/razorlanguageserver-osx-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b2940e8871ef222b0bc820b51ec44ed2/razorlanguageserver-platformagnostic-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bbc8d2a30ba7da4e0eb4465a329b1fa1/razorlanguageserver-win-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/dc3bfe5f9473a09cb823d665193d4ff0/razorlanguageserver-win-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/7ff9016973253dd93fa52aff5d631aa5/razorlanguageserver-win-x86-7.0.0-preview.24168.4.zip", "NEW_DEPS_VERSION": "7.0.0-preview.24168.4", "NEW_DEPS_ID": "Razor" }, @@ -185,8 +185,8 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/37c9cbad7a9df0efa17d40da3b8ff303/devkittelemetry-linux-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/782d968486f5324e3ff0c7d5fbc31191/devkittelemetry-linux-musl-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/7fc42bdb835a845efb4ee7cc5cf606d9/devkittelemetry-linux-musl-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b50efac289c46267b8e67318ab840ee4/devkittelemetry-linux-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9f4cdc6489f81ee9d94c218a61bc19a0/devkittelemetry-osx-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/473295a389ea3331c39b6bab7e52d990/devkittelemetry-osx-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9e99d301df6c535a4b5e031fbf3695d4/devkittelemetry-platformagnostic-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/36519b4fb02af42c26e5df12592999cc/devkittelemetry-win-arm64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/c32a8e0f3ef1690f9b76dafabbfa8cae/devkittelemetry-win-x64-7.0.0-preview.24161.6.zip,https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/5bf809c31472e7f6b734540f4f80c5f9/devkittelemetry-win-x86-7.0.0-preview.24161.6.zip", - "NEW_DEPS_VERSION": "7.0.0-preview.24161.6", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b9a6b44701b08cd5a8b2934260f5ad59/devkittelemetry-linux-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/3569c56beb063da89dff13444964e5ee/devkittelemetry-linux-musl-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/d0eb6050d4429ba1f833bb90549d6014/devkittelemetry-linux-musl-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/5c0781c22717cbf061552947d173035e/devkittelemetry-linux-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/962eebbee4f1618b8042745af0ee252d/devkittelemetry-osx-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/aeb2b93f02a901cc3b6f0a01db5ffefa/devkittelemetry-osx-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/addbbd1ec261f5576add7369416102c4/devkittelemetry-platformagnostic-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/973b8d03917bb4256ca01c91fe3638a7/devkittelemetry-win-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/95481d73dc1be495fccce0372813edac/devkittelemetry-win-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bdc33c639e44563abf4b3996d53a3191/devkittelemetry-win-x86-7.0.0-preview.24168.4.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.24168.4", "NEW_DEPS_ID": "RazorTelemetry" }, "cwd": "${workspaceFolder}" diff --git a/package.json b/package.json index a199aa867..3a7bcd729 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,9 @@ "defaults": { "roslyn": "4.10.0-3.24168.7", "omniSharp": "1.39.11", - "razor": "7.0.0-preview.24168.3", + "razor": "7.0.0-preview.24168.4", "razorOmnisharp": "7.0.0-preview.23363.1", - "razorTelemetry": "7.0.0-preview.24161.6" + "razorTelemetry": "7.0.0-preview.24168.4" }, "main": "./dist/extension", "l10n": "./l10n", @@ -608,7 +608,7 @@ { "id": "Razor", "description": "Razor Language Server (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/02a9c93c5bc82b70996f5156243ee8f3/razorlanguageserver-win-x64-7.0.0-preview.24168.3.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/dc3bfe5f9473a09cb823d665193d4ff0/razorlanguageserver-win-x64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "win32" @@ -616,12 +616,12 @@ "architectures": [ "x86_64" ], - "integrity": "9E0371C291AACB7AEF6578FE39BBAB78B9006E247C6EA49A8FB66EA8CCD8F152" + "integrity": "0F2BFD0048540086D608BB958F40E244536A33786FB7F76EE1A9FF7D34C1B124" }, { "id": "Razor", "description": "Razor Language Server (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/918f13e77424254801d2cfc619705c0d/razorlanguageserver-win-x86-7.0.0-preview.24168.3.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/7ff9016973253dd93fa52aff5d631aa5/razorlanguageserver-win-x86-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "win32" @@ -629,12 +629,12 @@ "architectures": [ "x86" ], - "integrity": "AEF2B4011CCC18F3423D5576AA5A9B84195E25404E7FEC33644CFAE995B3476F" + "integrity": "19A635F90853D2E282324A8427F2AF495AD4947303DD11E734430EAFBA3AF093" }, { "id": "Razor", "description": "Razor Language Server (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/f91126edb487118e6f63bfb105dc954b/razorlanguageserver-win-arm64-7.0.0-preview.24168.3.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bbc8d2a30ba7da4e0eb4465a329b1fa1/razorlanguageserver-win-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "win32" @@ -642,12 +642,12 @@ "architectures": [ "arm64" ], - "integrity": "BD557971ABD194C5A3E896EABFE7CAAD9A0F5FFF5D73E10A3A58E4C206688A5E" + "integrity": "7FB8617456C0C9CB12BEC5A18189B91709925E3AC74CCC95E4DF11E24C87A270" }, { "id": "Razor", "description": "Razor Language Server (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/005bf5f914f0375be5073a16b72e69fc/razorlanguageserver-linux-x64-7.0.0-preview.24168.3.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/fdf85820363515f55ce0f4e35a7fe780/razorlanguageserver-linux-x64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "linux" @@ -658,12 +658,12 @@ "binaries": [ "./rzls" ], - "integrity": "BCA28B44940DBA0087FC8E51CC4F67970BFB162B73C53B851772958D0FFF6930" + "integrity": "92993C6D3F74D5176826714AE6C1619B6538FD8085913F41BEFB7F8202CED137" }, { "id": "Razor", "description": "Razor Language Server (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/19b5104c27627401dc0abcf0b9c9ffd2/razorlanguageserver-linux-arm64-7.0.0-preview.24168.3.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "linux" @@ -674,12 +674,12 @@ "binaries": [ "./rzls" ], - "integrity": "D4E39C61CADA862CB89FBF39926105BE30D7E8718F66B190CE1F5D7527783FD9" + "integrity": "5BCBBF401B31274193900AAE1285E90FDF58B5225841BE66099B57D4E978E295" }, { "id": "Razor", "description": "Razor Language Server (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/d9cd8892894eb4e40899dbe73c056afa/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.3.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/97b57265a3097b6128aaa4be297f1243/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -690,12 +690,12 @@ "binaries": [ "./rzls" ], - "integrity": "A5EE72C16B2B0D9D3C920CFD66EC56EB6E30A381C3E16BD13C42A456DA774F27" + "integrity": "388B127FBA5025D52806EB0900D5E13C065203FEA4DF6C6CA1BA8EEE320D5D31" }, { "id": "Razor", "description": "Razor Language Server (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/7d63da59dc1b4958389e0f1786fb732c/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.3.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b6fa76f8ccfa8053f56f1fa3d39e78c9/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -706,12 +706,12 @@ "binaries": [ "./rzls" ], - "integrity": "BD5A0BED97E9809154A117948621FAB3ADB3B19A7130120512196E8C2EB7A7C8" + "integrity": "CF03AE8CFE86FB7DDC169ACA9F078A03FA32C1AB8535B92BAC83D5F47291249D" }, { "id": "Razor", "description": "Razor Language Server (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/b6920b1e1aab7d8480226a844713ea73/razorlanguageserver-osx-x64-7.0.0-preview.24168.3.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/581c065f415941a97c7687403da5d61c/razorlanguageserver-osx-x64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -722,12 +722,12 @@ "binaries": [ "./rzls" ], - "integrity": "8011818F564B66B0171BF5B3D2B2897B9A3665155925A91A423B151547EDAF6D" + "integrity": "7CA7693BDB386C98BD26E7BA5724D2848F564F1463324BDAC9AE61C22B5CE6C9" }, { "id": "Razor", "description": "Razor Language Server (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/bf46f3aae423b8ecf6862c4663b15f96/razorlanguageserver-osx-arm64-7.0.0-preview.24168.3.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/48d3bef6b7f06634e53ca433be40e52a/razorlanguageserver-osx-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -738,12 +738,12 @@ "binaries": [ "./rzls" ], - "integrity": "952533B38C201EEAEB6CB4CF477A515E6C6B6A8A54B9AD45FC9272A109E3AEFA" + "integrity": "AF561492013B04AEA29FDF93F1233922B8281905A0ECA09DA99657BF059682AA" }, { "id": "Razor", "description": "Razor Language Server (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/c456ad96-0490-4486-b3d0-fd01944016d1/bf5a5ff99adf3379daafe74e52b90b81/razorlanguageserver-platformagnostic-7.0.0-preview.24168.3.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b2940e8871ef222b0bc820b51ec44ed2/razorlanguageserver-platformagnostic-7.0.0-preview.24168.4.zip", "installPath": ".razor", "platforms": [ "neutral" @@ -754,7 +754,7 @@ "binaries": [ "./rzls" ], - "integrity": "05C080F35CF235B2E319783CF321A8F86AD7EAFC4003DADD211DE3077CB849FD" + "integrity": "F20BBB9A2CBA42938DB63BB4D8C0557029C29D92E2BF2B4390F4B69A116E9F17" }, { "id": "RazorOmnisharp", @@ -885,7 +885,7 @@ { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/c32a8e0f3ef1690f9b76dafabbfa8cae/devkittelemetry-win-x64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/95481d73dc1be495fccce0372813edac/devkittelemetry-win-x64-7.0.0-preview.24168.4.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -893,12 +893,12 @@ "architectures": [ "x86_64" ], - "integrity": "EEB71A415D0B1064462EAFF6DAD5451B7EBABF596E0651B1427387A2BA5EFA42" + "integrity": "8B8078A13EF000F1207FA1CF1646492A78B19406280EFA9A9F077AAA6C5ED8AB" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / x86)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/5bf809c31472e7f6b734540f4f80c5f9/devkittelemetry-win-x86-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bdc33c639e44563abf4b3996d53a3191/devkittelemetry-win-x86-7.0.0-preview.24168.4.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -906,12 +906,12 @@ "architectures": [ "x86" ], - "integrity": "733B72988371061F45C7749ADCDB4823B7CD6CE6F0ED9C8B8FAE48EEF1E58A7F" + "integrity": "66C2232C36B0ABF644AB97673096413B6094B504F4D4672C70EAAB465702EFFA" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Windows / ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/36519b4fb02af42c26e5df12592999cc/devkittelemetry-win-arm64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/973b8d03917bb4256ca01c91fe3638a7/devkittelemetry-win-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -919,12 +919,12 @@ "architectures": [ "arm64" ], - "integrity": "DAD54EC91D11EE1BA4DFFE3A2208BE49F8962551698388FB51B46F43022B9F8D" + "integrity": "8313AEEF5799B6CD2D888B172B0142FA176754E566C5AAE12058A15CB864D13D" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/b50efac289c46267b8e67318ab840ee4/devkittelemetry-linux-x64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/5c0781c22717cbf061552947d173035e/devkittelemetry-linux-x64-7.0.0-preview.24168.4.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -932,12 +932,12 @@ "architectures": [ "x86_64" ], - "integrity": "EDC6A71168CE4D7928BB8E27CB18A1F4EDB408B513866482009C39DABC613F2E" + "integrity": "314B9FE9DE95EAF36B1800693719507BF4222D0EA972A695A09AD1E3FA571BCC" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/37c9cbad7a9df0efa17d40da3b8ff303/devkittelemetry-linux-arm64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b9a6b44701b08cd5a8b2934260f5ad59/devkittelemetry-linux-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -945,12 +945,12 @@ "architectures": [ "arm64" ], - "integrity": "13C1061CFBB7EE2936CE5B2429881204EFC3BE7370D93C1C9D0A2BF71AC25DEE" + "integrity": "383CB6D5D274DC3772B11FA3EEDC3967AC0B25A2903E54A46A313F2629658433" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/7fc42bdb835a845efb4ee7cc5cf606d9/devkittelemetry-linux-musl-x64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/d0eb6050d4429ba1f833bb90549d6014/devkittelemetry-linux-musl-x64-7.0.0-preview.24168.4.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -958,12 +958,12 @@ "architectures": [ "x86_64" ], - "integrity": "3EAC160A974D179A58184AD1493BD23DF3D785BFF37E4D71ECAA886F04225182" + "integrity": "90EBB37711460744046230546284EFE255970A58A42C4C3DB47C4D38EEE637E4" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Linux musl ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/782d968486f5324e3ff0c7d5fbc31191/devkittelemetry-linux-musl-arm64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/3569c56beb063da89dff13444964e5ee/devkittelemetry-linux-musl-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -971,12 +971,12 @@ "architectures": [ "arm64" ], - "integrity": "7FD37E7AA8EE97C063ABB402E40B62D60152EBFFAB4404B3C60162EAA3442B20" + "integrity": "65301E973BDFC8760237092E67CCE0371C98C9E7C15D0625B5B128914F46004B" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS / x64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/473295a389ea3331c39b6bab7e52d990/devkittelemetry-osx-x64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/aeb2b93f02a901cc3b6f0a01db5ffefa/devkittelemetry-osx-x64-7.0.0-preview.24168.4.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -984,12 +984,12 @@ "architectures": [ "x86_64" ], - "integrity": "2A6B12BAAABC8BCFD3044AC636D3F76B15B9018B50B4590844ED6901823EF310" + "integrity": "7F05B9A5B3C756F59E407C0C4E406B972C5867BF243F392B37D9C61770ACA930" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (macOS ARM64)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9f4cdc6489f81ee9d94c218a61bc19a0/devkittelemetry-osx-arm64-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/962eebbee4f1618b8042745af0ee252d/devkittelemetry-osx-arm64-7.0.0-preview.24168.4.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -997,12 +997,12 @@ "architectures": [ "arm64" ], - "integrity": "54C311DB0BA90CEF48B3043462C401CA6ED1BBE5C0DF536350075F66FCFD2890" + "integrity": "75059674B947281485AB922A831B8DF8770FFBBA1479C77313D9DB9C2C2E61F0" }, { "id": "RazorTelemetry", "description": "Razor Language Server Telemetry (Platform Agnostic)", - "url": "https://download.visualstudio.microsoft.com/download/pr/39e88c64-efc2-4674-9b47-f2fed0bbd49d/9e99d301df6c535a4b5e031fbf3695d4/devkittelemetry-platformagnostic-7.0.0-preview.24161.6.zip", + "url": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/addbbd1ec261f5576add7369416102c4/devkittelemetry-platformagnostic-7.0.0-preview.24168.4.zip", "installPath": ".razortelemetry", "platforms": [ "netural" @@ -1010,7 +1010,7 @@ "architectures": [ "neutral" ], - "integrity": "5F56C977B57E6F241B2775EC2E121C977D0B294D9CFD5361A3B970BC56145FBB" + "integrity": "464173CCFC636AD1AE4DFCDD2306F5DB03BA32CD87071B00D3281967B844EC1D" } ], "engines": { @@ -5727,4 +5727,4 @@ } ] } -} +} \ No newline at end of file From 6c8853ef149790f33eeed353843cdf8a879013a0 Mon Sep 17 00:00:00 2001 From: Andrew Hall Date: Tue, 19 Mar 2024 15:05:30 -0700 Subject: [PATCH 24/25] Don't do meetings and look at long strings --- .vscode/launch.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 9f0df2e75..10bc2247d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -169,7 +169,7 @@ "updatePackageDependencies" ], "env": { - "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip", + "NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/74b76bfa424bd6a36b5fcbd11b801b45/razorlanguageserver-linux-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b6fa76f8ccfa8053f56f1fa3d39e78c9/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/97b57265a3097b6128aaa4be297f1243/razorlanguageserver-linux-musl-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/fdf85820363515f55ce0f4e35a7fe780/razorlanguageserver-linux-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/48d3bef6b7f06634e53ca433be40e52a/razorlanguageserver-osx-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/581c065f415941a97c7687403da5d61c/razorlanguageserver-osx-x64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/b2940e8871ef222b0bc820b51ec44ed2/razorlanguageserver-platformagnostic-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/bbc8d2a30ba7da4e0eb4465a329b1fa1/razorlanguageserver-win-arm64-7.0.0-preview.24168.4.zip,https://download.visualstudio.microsoft.com/download/pr/e6af6483-13d8-4a24-8f9d-d418fb39bd97/dc3bfe5f9473a09cb823d665193d4ff0/razorlanguageserver-win-x64-7.0.0-preview.24168.4.zip", "NEW_DEPS_VERSION": "7.0.0-preview.24168.4", "NEW_DEPS_ID": "Razor" }, From ad8824e43331c826b311bd9d5cde07164265a82a Mon Sep 17 00:00:00 2001 From: David Barbet Date: Mon, 25 Mar 2024 12:24:02 -0700 Subject: [PATCH 25/25] Fix changelog for latest prerelease --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38235c4dc..60d206971 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876) ## Latest +* Rename RazorComponentAttribute semantic token to razorComponentAttribute (PR: [#6867](https://github.com/dotnet/vscode-csharp/pull/6867)) +* Drop win32-ia32 platform support (PR: [#6983](https://github.com/dotnet/vscode-csharp/pull/6983)) +* Fix some issues with casing when comparing Razor files (PR: [#6974](https://github.com/dotnet/vscode-csharp/pull/6974)) +* Do not timeout on connecting to the server if waitForDebugger is set (PR: [#6969](https://github.com/dotnet/vscode-csharp/pull/6969)) +* Bump Razor and update changelog (PR: [#6965](https://github.com/dotnet/vscode-csharp/pull/6965)) + * Fix an issue that could cause numerous semantic tokens LSP failures on new projects (PR: [#10050](https://github.com/dotnet/razor/pull/10050)) + * Fix an issue with running on .NET 9 preview builds (PR: [#10064](https://github.com/dotnet/razor/pull/10064)) +* Update Debugger Packages to v2.19.17 (PR: [#6958](https://github.com/dotnet/vscode-csharp/pull/6958)) + +## 2.23.2 - Updated debugger to fix .NET debugging break with searchNuGetOrgSymbolServer enabled (PR: [#6937](https://github.com/dotnet/vscode-csharp/pull/6937)) - Update Razor to add formatting option to force open brace onto the next line after a @code or @functions block (PR: [#10018](https://github.com/dotnet/razor/pull/10018)) @@ -18,8 +28,6 @@ - Don't ship as self-contained (PR: [#9891](https://github.com/dotnet/razor/pull/9891)) - Better using directive completiong (PR: [#9982](https://github.com/dotnet/razor/pull/9982)) - Add option to format code block open brace on new line (PR: [#10018](https://github.com/dotnet/razor/pull/10018) and [#6939](https://github.com/dotnet/vscode-csharp/pull/6939)) - - Fix an issue that could cause numerous semantic tokens LSP failures on new projects (PR: [#10050](https://github.com/dotnet/razor/pull/10050)) - - Fix an issue with running on .NET 9 preview builds (PR: [#10064](https://github.com/dotnet/razor/pull/10064)) ## 2.19.13 * Fix `Attribute` snippet (PR: [#6879](https://github.com/dotnet/vscode-csharp/pull/6879))