Some more cleanup in OmnisharpPackageCreator

Author: winstliu

src/omnisharp/OmnisharpPackageCreator.ts

@@ -8,14 +8,11 @@ import { Package } from "../packageManager/Package";
 export const modernNetVersion = "6.0";
 
 export function GetPackagesFromVersion(version: string, useFramework: boolean, runTimeDependencies: Package[], serverUrl: string, installPath: string): Package[] {
-    const versionPackages: Package[] = [];
-    for (const inputPackage of runTimeDependencies) {
-        if (inputPackage.platformId !== undefined && inputPackage.isFramework === useFramework) {
-            versionPackages.push(SetBinaryAndGetPackage(inputPackage, useFramework, serverUrl, version, installPath));
-        }
-    }
-
-    return versionPackages;
+    return runTimeDependencies
+        .filter(inputPackage =>
+            inputPackage.platformId !== undefined && inputPackage.isFramework === useFramework)
+        .map(inputPackage =>
+            SetBinaryAndGetPackage(inputPackage, useFramework, serverUrl, version, installPath));
 }
 
 export function SetBinaryAndGetPackage(inputPackage: Package, useFramework: boolean, serverUrl: string, version: string, installPath: string): Package {
@@ -24,7 +21,7 @@ export function SetBinaryAndGetPackage(inputPackage: Package, useFramework: bool
         // .NET 6 packages use system `dotnet OmniSharp.dll`
         installBinary = 'OmniSharp.dll';
     }
-    else if (inputPackage.platformId === 'win-x86' || inputPackage.platformId === 'win-x64' || inputPackage.platformId === 'win-arm64') {
+    else if (inputPackage.platforms.includes('win32')) {
         installBinary = 'OmniSharp.exe';
     }
     else {
@@ -35,24 +32,13 @@ export function SetBinaryAndGetPackage(inputPackage: Package, useFramework: bool
 }
 
 function GetPackage(inputPackage: Package, useFramework: boolean, serverUrl: string, version: string, installPath: string, installBinary: string): Package {
-    if (!version) {
-        throw new Error('Invalid version');
-    }
-
     const packageSuffix = useFramework ? '' : `-net${modernNetVersion}`;
 
-    let versionPackage: Package = {
-        id: inputPackage.id,
+    return {
+        ...inputPackage,
         description: `${inputPackage.description}, Version = ${version}`,
         url: `${serverUrl}/releases/${version}/omnisharp-${inputPackage.platformId}${packageSuffix}.zip`,
         installPath: `${installPath}/${version}${packageSuffix}`,
         installTestPath: `./${installPath}/${version}${packageSuffix}/${installBinary}`,
-        platforms: inputPackage.platforms,
-        architectures: inputPackage.architectures,
-        binaries: inputPackage.binaries,
-        platformId: inputPackage.platformId,
-        isFramework: useFramework
     };
-
-    return versionPackage;
 }