update openssl-prebuild for musl failures

build/azure-pipelines/darwin/cli-build-darwin.yml

@@ -13,15 +13,15 @@ steps:
     displayName: Download openssl prebuilt
     inputs:
       command: custom
-      customCommand: pack @vscode-internal/openssl-prebuilt@0.0.3
+      customCommand: pack @vscode-internal/openssl-prebuilt@0.0.5
       customRegistry: useFeed
       customFeed: 'Monaco/openssl-prebuilt'
       workingDir: $(Build.ArtifactStagingDirectory)
 
   - script: |
       set -e
       mkdir $(Build.ArtifactStagingDirectory)/openssl
-      tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.3.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
+      tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
     displayName: Extract openssl prebuilt
 
   - task: NodeTool@0

build/azure-pipelines/linux/cli-build-linux.yml

@@ -22,23 +22,23 @@ steps:
     displayName: Download openssl prebuilt
     inputs:
       command: custom
-      customCommand: pack @vscode-internal/openssl-prebuilt@0.0.3
+      customCommand: pack @vscode-internal/openssl-prebuilt@0.0.5
       customRegistry: useFeed
       customFeed: 'Monaco/openssl-prebuilt'
       workingDir: $(Build.ArtifactStagingDirectory)
 
   - script: |
       set -e
       mkdir $(Build.ArtifactStagingDirectory)/openssl
-      tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.3.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
+      tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
     displayName: Extract openssl prebuilt
 
   # inspired by: https://github.com/emk/rust-musl-builder/blob/main/Dockerfile
   - ${{ if or(eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_ALPINE, true)) }}:
     - bash: |
         set -e
         sudo apt-get update
-        sudo apt-get install -yq build-essential musl-dev musl-tools linux-libc-dev pkgconf xutils-dev
+        sudo apt-get install -yq build-essential musl-dev musl-tools linux-libc-dev pkgconf xutils-dev lld
         sudo ln -s "/usr/bin/g++" "/usr/bin/musl-g++" || echo "link exists"
       displayName: Install musl build dependencies
 
@@ -91,9 +91,9 @@ steps:
         VSCODE_CLI_ENV:
           CXX_aarch64-unknown-linux-musl: musl-g++
           CC_aarch64-unknown-linux-musl: musl-gcc
-          RUSTFLAGS: "-L $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib"
-          OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib
-          OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/include
+          OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux-musl/lib
+          OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux-musl/include
+          OPENSSL_STATIC: '1'
 
   - ${{ if eq(parameters.VSCODE_BUILD_ALPINE, true) }}:
     - template: ../cli/cli-compile-and-publish.yml
@@ -103,8 +103,9 @@ steps:
         VSCODE_CLI_ENV:
           CXX_aarch64-unknown-linux-musl: musl-g++
           CC_aarch64-unknown-linux-musl: musl-gcc
-          OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/lib
-          OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/include
+          OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux-musl/lib
+          OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux-musl/include
+          OPENSSL_STATIC: '1'
 
   - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
     - template: ../cli/cli-compile-and-publish.yml

build/azure-pipelines/win32/cli-build-win32.yml

@@ -16,14 +16,14 @@ steps:
     displayName: Download openssl prebuilt
     inputs:
       command: custom
-      customCommand: pack @vscode-internal/openssl-prebuilt@0.0.3
+      customCommand: pack @vscode-internal/openssl-prebuilt@0.0.5
       customRegistry: useFeed
       customFeed: 'Monaco/openssl-prebuilt'
       workingDir: $(Build.ArtifactStagingDirectory)
 
   - powershell: |
       mkdir $(Build.ArtifactStagingDirectory)/openssl
-      tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.3.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
+      tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.5.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
     displayName: Extract openssl prebuilt
 
   - task: NodeTool@0

cli/Cargo.toml

@@ -15,7 +15,7 @@ name = "code"
 futures = "0.3"
 clap = { version = "3.0", features = ["derive", "env"] }
 open = { version = "2.1.0" }
-reqwest = { version = "0.11.9", default-features = false, features = ["json", "stream", "native-tls-vendored"] }
+reqwest = { version = "0.11.9", default-features = false, features = ["json", "stream", "native-tls"] }
 tokio = { version = "1.24.2", features = ["full"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 flate2 = { version = "1.0.22" }
@@ -31,12 +31,12 @@ dirs = "4.0.0"
 rand = "0.8.5"
 atty = "0.2.14"
 opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
-opentelemetry-application-insights = { version = "0.22.0", features = ["reqwest-client-vendored-tls"] }
+opentelemetry-application-insights = { version = "0.22.0", features = ["reqwest-client"] }
 serde_bytes = "0.11.5"
 chrono = { version = "0.4", features = ["serde"] }
 gethostname = "0.2.3"
 libc = "0.2"
-tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "3870e9133dfb9557774521bb447827f19b26e55d", default-features = false, features = ["connections", "vendored-openssl"] }
+tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "730aa86f8ccd9e2dd4541693fbce763357da93f4", default-features = false, features = ["connections"] }
 keyring = "1.1"
 dialoguer = "0.10"
 hyper = "0.14"
@@ -70,7 +70,7 @@ zbus = { version = "3.4", default-features = false, features = ["tokio"] }
 russh = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
 russh-cryptovec = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
 russh-keys = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }
-secret-service = { git = "https://github.com/microsoft/vscode-secret-service-rs", rev = "30f0414108a122d6f2bfc28a5425d0dac9738518" }
+secret-service = { git = "https://github.com/microsoft/vscode-secret-service-rs", rev = "fbbaf222de10546609be26bb043e64356e855edb" }
 
 [profile.release]
 strip = true

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.77.0",
-  "distro": "52635c8055ef02ea8f780dcd04d1fb534b1b30db",
+  "distro": "b6ce387d48144f5c7d0d33843b76e545fe561af7",
   "author": {
     "name": "Microsoft Corporation"
   },