From c61e760c8d486d27aae2a115e5c586f87e3c3159 Mon Sep 17 00:00:00 2001 From: Jordi Ramos Date: Wed, 7 Feb 2024 13:46:59 -0800 Subject: [PATCH 01/12] 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/12] 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 cada8f8d6bbd00d3fe0f4d5dfd39f40a5df8187e Mon Sep 17 00:00:00 2001 From: David Wengier Date: Fri, 15 Mar 2024 21:50:13 +1100 Subject: [PATCH 03/12] Bump Razor to 7.0.0-preview.24165.1 --- .vscode/launch.json | 8 ++--- package.json | 84 ++++++++++++++++++++++----------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 102bdcd8c..13e69422c 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/75786463-0990-490f-b7fb-12625a4ea6f0/180d42a07c73a4a9e697844deff974a4/razorlanguageserver-linux-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/8067cf03bc5e8bc0787224c9ecc7966e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/01c3118ce7681fc099e0ac3a7d3bacbb/razorlanguageserver-linux-musl-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/8e57cb83c3bd75560c4a17336b074e5c/razorlanguageserver-linux-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/a00625534db057426d2228e228874f06/razorlanguageserver-osx-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/b8b7057c3ce33d2bb0cd491d0db2b27f/razorlanguageserver-osx-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/75229770f1b565131f00892437f62ac2/razorlanguageserver-platformagnostic-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/d7797ce73b2d0cffbb33b94741ed2d26/razorlanguageserver-win-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/e5a040b9889fc715d74690232b3830ff/razorlanguageserver-win-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/4f43ee6a33d8a4be4e4f9b0af8b4141f/razorlanguageserver-win-x86-7.0.0-preview.24165.1.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.24165.1", "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/75786463-0990-490f-b7fb-12625a4ea6f0/c2abf1081249b15fd4cdc8891ca5ea33/devkittelemetry-linux-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/0051257b31161483f5948e703ec64e6a/devkittelemetry-linux-musl-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/f163027e0885cee32f82ce2e08fde42e/devkittelemetry-linux-musl-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/1131d8f8b76726913012b2dafe62a96d/devkittelemetry-linux-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/daa21bc25bd780a3c8129b430b5c9c3f/devkittelemetry-osx-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/fc14d7fe591b0d97a976d75c202f0628/devkittelemetry-osx-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/273a86e884dcc940a9bbc050bf31fd2e/devkittelemetry-platformagnostic-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/a3afc37a8f6fd12c5ff2f3c2975fee7b/devkittelemetry-win-arm64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/c56f49d55f76dbe6c88b590b6f66f1f1/devkittelemetry-win-x64-7.0.0-preview.24165.1.zip,https://download.visualstudio.microsoft.com/download/pr/75786463-0990-490f-b7fb-12625a4ea6f0/e980f2cc28bbd493036a27d8d0261b63/devkittelemetry-win-x86-7.0.0-preview.24165.1.zip", + "NEW_DEPS_VERSION": "7.0.0-preview.24165.1", "NEW_DEPS_ID": "RazorTelemetry" }, "cwd": "${workspaceFolder}" diff --git a/package.json b/package.json index a4b010759..12d504ffc 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.24165.1", "razorOmnisharp": "7.0.0-preview.23363.1", - "razorTelemetry": "7.0.0-preview.24151.1" + "razorTelemetry": "7.0.0-preview.24165.1" }, "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/75786463-0990-490f-b7fb-12625a4ea6f0/e5a040b9889fc715d74690232b3830ff/razorlanguageserver-win-x64-7.0.0-preview.24165.1.zip", "installPath": ".razor", "platforms": [ "win32" @@ -616,12 +616,12 @@ "architectures": [ "x86_64" ], - "integrity": "AB0C0E9074055663D92BF8638753CE3C95E271F11C3E16F9ACC4CE4324B42598" + "integrity": "6B06C36B41BA1A58A569B006B892A6A4FFC79D997DD61F2932949B5D8E6AFFA5" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/4f43ee6a33d8a4be4e4f9b0af8b4141f/razorlanguageserver-win-x86-7.0.0-preview.24165.1.zip", "installPath": ".razor", "platforms": [ "win32" @@ -629,12 +629,12 @@ "architectures": [ "x86" ], - "integrity": "FD73259AF9D0D5BC5A4ABD55B9736482F0C40F91FBE3F7EA0014BB39220E8EFD" + "integrity": "9125396CEBA6E753682B5B548A437BEE80A4C40B2BE50C72049234B37AADC42D" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/d7797ce73b2d0cffbb33b94741ed2d26/razorlanguageserver-win-arm64-7.0.0-preview.24165.1.zip", "installPath": ".razor", "platforms": [ "win32" @@ -642,12 +642,12 @@ "architectures": [ "arm64" ], - "integrity": "D9A3F5874412FEE757E54B677005DE3E9B80E48D8E5EFF1416CA9C3572F4642C" + "integrity": "5E956FE38FCBD580AA54FA427AB9F08275CCE6C7098D1234D8653E6330C508F4" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/8e57cb83c3bd75560c4a17336b074e5c/razorlanguageserver-linux-x64-7.0.0-preview.24165.1.zip", "installPath": ".razor", "platforms": [ "linux" @@ -658,12 +658,12 @@ "binaries": [ "./rzls" ], - "integrity": "AE20E1FBE407C93E038AE264C696BA53319AC32CA3B497FEE90A8548E888E0D5" + "integrity": "5125DF665B90587C0731BE65E85E9226B5F40FFD1D6C2116BA62A4CEF9BDF83C" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/180d42a07c73a4a9e697844deff974a4/razorlanguageserver-linux-arm64-7.0.0-preview.24165.1.zip", "installPath": ".razor", "platforms": [ "linux" @@ -674,12 +674,12 @@ "binaries": [ "./rzls" ], - "integrity": "1BC2F876009DB0E0667B529331711343CF3D8BC325810A8836146AECFE515C7F" + "integrity": "9155197B516E86402E4835B9A44B010FA0B634F1E69537D7C12608E7ECEA83E5" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/01c3118ce7681fc099e0ac3a7d3bacbb/razorlanguageserver-linux-musl-x64-7.0.0-preview.24165.1.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -690,12 +690,12 @@ "binaries": [ "./rzls" ], - "integrity": "BDD8DE368048E534C9329B7B66D2922FFBDF10EB3358B487A1328DFC0A5FFF47" + "integrity": "A47542CC9A20606E3AE6EFE9F7BF7D9C32FA87BA03191B1D96E9CB177FBDBE3B" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/8067cf03bc5e8bc0787224c9ecc7966e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24165.1.zip", "installPath": ".razor", "platforms": [ "linux-musl" @@ -706,12 +706,12 @@ "binaries": [ "./rzls" ], - "integrity": "CD616D433E380D6F29932AEC8D90C541287BDC9231C51853967D7E92A292B899" + "integrity": "A1724A5C00BFA4A11E0CAF5E4D12F58DB19C83971D08C9C7F1FB8F99FAC4787C" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/b8b7057c3ce33d2bb0cd491d0db2b27f/razorlanguageserver-osx-x64-7.0.0-preview.24165.1.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -722,12 +722,12 @@ "binaries": [ "./rzls" ], - "integrity": "699E0A522D5EF326DCFA0666182536126BB553AD1FBF27507E8A149B140A6F01" + "integrity": "E0999AF22A82671999E18ECB9B3F399F54C49460B2DA9444157757ED0A7B5807" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/a00625534db057426d2228e228874f06/razorlanguageserver-osx-arm64-7.0.0-preview.24165.1.zip", "installPath": ".razor", "platforms": [ "darwin" @@ -738,12 +738,12 @@ "binaries": [ "./rzls" ], - "integrity": "9A4FFCDF762E6ED6A41F22A852DE89E199197DF52228EDCE0E5F0CEF719931F1" + "integrity": "178E6ADA4C4B62594C4CB7D6D88439ECE0802B33EC36F91C7EBBE1425715920F" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/75229770f1b565131f00892437f62ac2/razorlanguageserver-platformagnostic-7.0.0-preview.24165.1.zip", "installPath": ".razor", "platforms": [ "neutral" @@ -754,7 +754,7 @@ "binaries": [ "./rzls" ], - "integrity": "3933E9859168AFD6D65E525B736E7B69C8113C4AB44367E5159CCA5E809DE39D" + "integrity": "923D5C691D01B7D8481C56EE602A6614B2D8D56238E0B90B333DAD3F6C8C8456" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/c56f49d55f76dbe6c88b590b6f66f1f1/devkittelemetry-win-x64-7.0.0-preview.24165.1.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -893,12 +893,12 @@ "architectures": [ "x86_64" ], - "integrity": "8EB27E4E82D6906A3A1BABD9B7F830C0D6F79693F2538142D0E3D87CB5478D5F" + "integrity": "D2DF0141740001F4C62DC2EB1F4BEE08589331E8C7938AC900FE2AEF48EB2997" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/e980f2cc28bbd493036a27d8d0261b63/devkittelemetry-win-x86-7.0.0-preview.24165.1.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -906,12 +906,12 @@ "architectures": [ "x86" ], - "integrity": "13AC5BE6D924B387035202C20A44BC1AFF3F1C62317634964C1B3A12E4A2B7B1" + "integrity": "FF37F737420BE4E4D3096B08B6CD6D50C037A7C56323D15803DD04F5684CDBEA" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/a3afc37a8f6fd12c5ff2f3c2975fee7b/devkittelemetry-win-arm64-7.0.0-preview.24165.1.zip", "installPath": ".razortelemetry", "platforms": [ "win32" @@ -919,12 +919,12 @@ "architectures": [ "arm64" ], - "integrity": "58E6B0492B81A7BFFF1E66CB5AF0263E23DEF5A72345D8A23DAB8ADEB761C975" + "integrity": "3762FFBE978E92872760E6094FCDD646EE1E6B15454B7C3C95E796C3ECC2C338" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/1131d8f8b76726913012b2dafe62a96d/devkittelemetry-linux-x64-7.0.0-preview.24165.1.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -932,12 +932,12 @@ "architectures": [ "x86_64" ], - "integrity": "275C4C88C6EF1B489969C0082F7EFC86ADD2B17F172948BF2E9A61D5D73DD698" + "integrity": "F7BC1320CBFE229F7ABEA7EAC52F960593C44010FF69C49F756ADA1142EADB6B" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/c2abf1081249b15fd4cdc8891ca5ea33/devkittelemetry-linux-arm64-7.0.0-preview.24165.1.zip", "installPath": ".razortelemetry", "platforms": [ "linux" @@ -945,12 +945,12 @@ "architectures": [ "arm64" ], - "integrity": "873758020EF3768819C2F1B93F911348D40BFC87DCE7A0EF1F979C3B4F91910F" + "integrity": "412EC341E2A8828669BFBDCABC717364CA0220F0286B89BA29FCC351CC3DB2EC" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/f163027e0885cee32f82ce2e08fde42e/devkittelemetry-linux-musl-x64-7.0.0-preview.24165.1.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -958,12 +958,12 @@ "architectures": [ "x86_64" ], - "integrity": "D4FADF7BAC8B16DE221013BA443474FB6AB8ECF526DF2F6CACE4DD9D9AEB421A" + "integrity": "A9B59F2CEA7CC607A351367574E34BCABEFE1939AC86601A4EAD7802A42AB5D2" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/0051257b31161483f5948e703ec64e6a/devkittelemetry-linux-musl-arm64-7.0.0-preview.24165.1.zip", "installPath": ".razortelemetry", "platforms": [ "linux-musl" @@ -971,12 +971,12 @@ "architectures": [ "arm64" ], - "integrity": "9044005439E9BBAC20C6F4FB76C66ECF31138E8FD38696F5065253BCB7A7C504" + "integrity": "A2BBCDB4DC62F67A1B65AEBEF9245EF10A37FD2078BD0D0DDDCAB4A6E052F6CA" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/fc14d7fe591b0d97a976d75c202f0628/devkittelemetry-osx-x64-7.0.0-preview.24165.1.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -984,12 +984,12 @@ "architectures": [ "x86_64" ], - "integrity": "2A523E297DF03E74926F990BF267286B7F426E67177740DE9503ADBF42D53812" + "integrity": "F468E65E305FF5E5FD31988F0D2F24294D90FA3737372D1BB43E771815940C24" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/daa21bc25bd780a3c8129b430b5c9c3f/devkittelemetry-osx-arm64-7.0.0-preview.24165.1.zip", "installPath": ".razortelemetry", "platforms": [ "darwin" @@ -997,12 +997,12 @@ "architectures": [ "arm64" ], - "integrity": "879D956ECFDCF9FD5AA97F32E0DF010D05E4AAF03F22227D94A7498CF8E927DD" + "integrity": "1B25EE50270F42B9CF517DB03910068F7B6E36C6BC4BA2715F583E43F9B8F040" }, { "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/75786463-0990-490f-b7fb-12625a4ea6f0/273a86e884dcc940a9bbc050bf31fd2e/devkittelemetry-platformagnostic-7.0.0-preview.24165.1.zip", "installPath": ".razortelemetry", "platforms": [ "netural" @@ -1010,7 +1010,7 @@ "architectures": [ "neutral" ], - "integrity": "8E4318FCC9D8A5107037FC887DE8622032545BF7770F1D79DC902125384832D3" + "integrity": "A80DF0D2A3DC043290B31A2E082631AEE3D93CFA48E7FEEDC6465854A4567A80" } ], "engines": { From 40ad2645e03d169d71e358095ec3608a87f178e3 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Mon, 18 Mar 2024 14:42:06 -0700 Subject: [PATCH 04/12] 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 05/12] 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 06/12] 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 07/12] 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 08/12] 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 09/12] 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 10/12] 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 11/12] 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 12/12] 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))