[wasm] Fix package update scripts for local builds

Fix package update scripts for local builds

3 files changed, 16 insertions, 24 deletions

diff --git a/sdks/wasm/package-update/README.md b/sdks/wasm/package-update/README.md
index a1d0c12a268..9da2d33c2c1 100644
--- a/sdks/wasm/package-update/README.md
+++ b/sdks/wasm/package-update/README.md
@@ -8,11 +8,8 @@ Make sure that you have the latest Blazor WebAssembly version:
 
 ## To run:
 
-`.\download-packages.ps1 -runtime <blazor webassembly runtime> -url <url to download .zip of wasm build>`
-
--- or --
-
-`.\download-packages.ps1 -runtime <blazor webassembly runtime> -filepath <filepath to wasm build>`
+`.\download-packages.ps1 -r <blazor webassembly runtime> -u <url to download .zip of wasm build> -asp_working_dir <path to aspnetcore working dir> -mono_working_dir <path to mono working dir>`
 
+if no url is specified, the script will use a local build from the specified mono working directory. 
 
 `download-packages.sh` is the bash equivalent. 
\ No newline at end of file
diff --git a/sdks/wasm/package-update/download-packages.ps1 b/sdks/wasm/package-update/download-packages.ps1
index 8397dd81ac0..2c12a12d082 100644
--- a/sdks/wasm/package-update/download-packages.ps1
+++ b/sdks/wasm/package-update/download-packages.ps1
@@ -1,4 +1,4 @@
-param ($filepath, $url, $runtime, $asp_working_dir, $mono_working_dir, $asp_remote_name, $mono_remote_name)
+param ($url, $runtime, $asp_working_dir, $mono_working_dir, $asp_remote_name, $mono_remote_name)
 
 if ($null -eq $asp_remote_name) {
 	$asp_remote_name="upstream"
@@ -45,11 +45,13 @@ $TMP_DIR=(mktemp -d)
 $TMP_PKG_DIR="$TMP_DIR\\wasm-package"
 mkdir $TMP_DIR
 
-if ($null -eq $filepath) {
+if ($null -ne $url) {
 	Invoke-WebRequest -Uri $url -OutFile $TMP_DIR\wasm-package.zip -UseBasicParsing
 	Expand-Archive "$TMP_DIR\\wasm-package.zip" -d $TMP_PKG_DIR
 } else {
-	Expand-Archive $filepath -d $TMP_PKG_DIR
+	cp -r "$mono_working_dir/sdks/out/wasm-bcl" $TMP_PKG_DIR
+	cp -r "$mono_working_dir/sdks/wasm/framework" $TMP_PKG_DIR
+	cp -r "$mono_working_dir/sdks/wasm/builds" $TMP_PKG_DIR
 }
 
 rm -r $PACKAGE_PATH\bcl
diff --git a/sdks/wasm/package-update/download-packages.sh b/sdks/wasm/package-update/download-packages.sh
index f3e7a05c885..22350c6913a 100644
--- a/sdks/wasm/package-update/download-packages.sh
+++ b/sdks/wasm/package-update/download-packages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e 
 set -u
 
@@ -6,6 +6,8 @@ ASP_REMOTE_NAME="upstream"
 MONO_REMOTE_NAME="upstream"
 ASP_BRANCH_NAME="blazor-wasm"
 MONO_BRANCH_NAME="master"
+FILEPATH=""
+URL=""
 
 while (("$#"));
 do 
@@ -16,10 +18,6 @@ do
         RUNTIME_VER="$2"
         shift 2
         ;;
-    -f|--filepath)
-        FILEPATH="$2"
-        shift 2
-        ;;
     -u|--url)
         URL="$2"
         shift 2
@@ -46,8 +44,6 @@ do
     esac
 done
 
-echo $MONO
-
 if [ -z "$RUNTIME_VER" ]; then
 	echo "Error: runtime version required. Use -r"
 	exit 1
@@ -63,30 +59,27 @@ if [ -z "$MONO" ]; then
     exit 1
 fi
 
-if  [ -z "$FILEPATH" -a -z "$URL" ]; then
-	echo "Error: Either path to the wasm package file required, or the url to download from."
-	exit 1
-fi
-
 NUGET_HOME=${NUGET_HOME:-"$HOME/.nuget"}
 PACKAGE_PATH="$NUGET_HOME/packages/microsoft.aspnetcore.components.webassembly.runtime/$RUNTIME_VER/tools/dotnetwasm"
 PROXY_PACKAGE_PATH="$NUGET_HOME/packages/microsoft.aspnetcore.components.webassembly.devserver/$RUNTIME_VER/tools/BlazorDebugProxy"
 ASP_PROXY_PATH="$ASPNETCORE/src/Components/WebAssembly/DebugProxy/src"
 MONO_PROXY_PATH="$MONO/sdks/wasm/Mono.WebAssembly.DebuggerProxy"
 TMP_DIR=`mktemp -d`
-TMP_PKG_DIR=$TMP_DIR/wasm-package/
+TMP_PKG_DIR=$TMP_DIR/wasm-package
+mkdir $TMP_PKG_DIR
 
 if [ ! -d "$NUGET_HOME" ]; then
 	echo "NUGET_HOME envar = $NUGET_HOME does not exist."
 	exit 1
 fi
 
-if [ -z "$FILEPATH" ]
-then
+if [ ! -z "$URL" ]; then
     wget -O "$TMP_DIR/wasm-package.zip" $URL
     unzip "$TMP_DIR/wasm-package.zip" -d $TMP_PKG_DIR
 else
-    unzip "$FILEPATH" -d $TMP_PKG_DIR
+    cp -r "$MONO/sdks/out/wasm-bcl" $TMP_PKG_DIR
+    cp -r "$MONO/sdks/wasm/framework" $TMP_PKG_DIR
+    cp -r "$MONO/sdks/wasm/builds" $TMP_PKG_DIR
 fi
 
 echo "pkg: $TMP_PKG_DIR"