From 2988ee269be550468bf894c8cae72eca8cc92d05 Mon Sep 17 00:00:00 2001
From: Chris Simon <chris@devcycles.io>
Date: Mon, 11 Mar 2024 11:42:33 +0000
Subject: [PATCH] ci: remove attempt to apply upload asset label to rule out
 issues with asset path identification

---
 src/intellij/build.fsx                  | 3 +--
 src/language-server/build.fsx           | 5 ++---
 src/vscode/build.fsx                    | 9 ++++++---
 src/vscode/contextive/package-lock.json | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/intellij/build.fsx b/src/intellij/build.fsx
index b175db3d..52bd2e71 100644
--- a/src/intellij/build.fsx
+++ b/src/intellij/build.fsx
@@ -30,8 +30,7 @@ pipeline "Contextive IntelliJ Plugin" {
         stage "Upload Asset" {
             workingDir distPath
 
-            run (fun ctx ->
-                $"gh release upload {ctx.GetCmdArg(args.release)} '{intelliJAssetFileName ctx}#{intelliJAssetLabel ctx}'")
+            run (fun ctx -> $"gh release upload {ctx.GetCmdArg(args.release)} {intelliJAssetFileName ctx}")
         }
 
         stage "Publish Package" { run (bashCmd "./gradlew publishPlugin") }
diff --git a/src/language-server/build.fsx b/src/language-server/build.fsx
index 8347ebd3..de1409e4 100644
--- a/src/language-server/build.fsx
+++ b/src/language-server/build.fsx
@@ -6,7 +6,7 @@ open Fun.Build
 open Common
 
 let languageServerLabel (ctx: Internal.StageContext) =
-    $"Contextive Language Server {ctx.GetCmdArg(args.release)} ({ctx.GetCmdArg(args.vscePlatform)})"
+    $"Contextive Language Server {ctx.GetCmdArg(args.release)} ({ctx.GetCmdArg(args.dotnetRuntime)})"
 
 
 let dotnetTest app =
@@ -93,8 +93,7 @@ let zipAndUploadAsset app =
 
                 whenCmdArg args.release
 
-                run (fun ctx ->
-                    $"gh release upload {ctx.GetCmdArg(args.release)} '{appZipPath app ctx}#{languageServerLabel ctx}'")
+                run (fun ctx -> $"gh release upload {ctx.GetCmdArg(args.release)} {appZipPath app ctx}")
             }
         }
     }
diff --git a/src/vscode/build.fsx b/src/vscode/build.fsx
index a557f5e8..38c79fd0 100644
--- a/src/vscode/build.fsx
+++ b/src/vscode/build.fsx
@@ -122,11 +122,14 @@ pipeline "Contextive VsCode Extension" {
         }
 
         stage "Upload Asset" {
-            run (fun ctx ->
-                $"gh release upload {ctx.GetCmdArg(args.release)} '{vsCodeAssetFileName ctx}#{vsCodeAssetLabel ctx}'")
+            workingDir distPath
+            run (fun ctx -> $"gh release upload {ctx.GetCmdArg(args.release)} {vsCodeAssetFileName ctx}")
         }
 
-        stage "Publish to Marketplace" { run (fun ctx -> $"npx vsce publish --packagePath {vsCodeAssetFileName ctx}") }
+        stage "Publish to Marketplace" {
+            workingDir distPath
+            run (fun ctx -> $"npx vsce publish --packagePath {vsCodeAssetFileName ctx}")
+        }
     }
 
     runIfOnlySpecified false
diff --git a/src/vscode/contextive/package-lock.json b/src/vscode/contextive/package-lock.json
index f216b4d7..31db1c85 100644
--- a/src/vscode/contextive/package-lock.json
+++ b/src/vscode/contextive/package-lock.json
@@ -33,7 +33,7 @@
 				"webpack-node-externals": "^3.0.0"
 			},
 			"engines": {
-				"vscode": "^1.63.0"
+				"vscode": "^1.85.0"
 			}
 		},
 		"node_modules/@ampproject/remapping": {