Drop win32-ia32 platform support

dibarbet · dibarbet · commit 40ad2645e03d · 2024-03-18T14:42:06.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/main.ts b/src/main.ts
diff --git a/tasks/offlinePackagingTasks.ts b/tasks/offlinePackagingTasks.ts
