From 9dd1081adb4dc4ada62d4e4bce1fd9168ede38d2 Mon Sep 17 00:00:00 2001 From: Caelan Date: Sun, 22 Sep 2024 16:12:28 -0600 Subject: [PATCH] Fix dev sample scripts --- samples/CSharpAvalonia/dev-scripts/build-linux.sh | 9 +++++---- samples/CSharpAvalonia/dev-scripts/build-osx.sh | 9 +++++---- samples/CSharpAvalonia/dev-scripts/build-win.bat | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/samples/CSharpAvalonia/dev-scripts/build-linux.sh b/samples/CSharpAvalonia/dev-scripts/build-linux.sh index 24248df4..02216206 100644 --- a/samples/CSharpAvalonia/dev-scripts/build-linux.sh +++ b/samples/CSharpAvalonia/dev-scripts/build-linux.sh @@ -14,19 +14,20 @@ BUILD_VERSION="$1" RELEASE_DIR="$SCRIPT_DIR/../releases" PUBLISH_DIR="$SCRIPT_DIR/../publish" +cd "$SCRIPT_DIR/../../.." + echo "" echo "Building Velopack Rust" -cd "$SCRIPT_DIR/../../../src/Rust" cargo build --target x86_64-unknown-linux-gnu cp target/x86_64-unknown-linux-gnu/debug/update target/debug/update echo "" echo "Building Velopack Vpk" -cd "$SCRIPT_DIR/../../.." -dotnet build src/Velopack.Vpk/Velopack.Vpk.csproj +dotnet build src/vpk/Velopack.Vpk/Velopack.Vpk.csproj + +cd "$SCRIPT_DIR/.." echo "" -cd "$SCRIPT_DIR/.." echo "Compiling VelopackCSharpAvalonia with dotnet..." dotnet publish -c Release --self-contained -r linux-x64 -o "$PUBLISH_DIR" -p:UseLocalVelopack=true diff --git a/samples/CSharpAvalonia/dev-scripts/build-osx.sh b/samples/CSharpAvalonia/dev-scripts/build-osx.sh index 847a212c..7cab7296 100644 --- a/samples/CSharpAvalonia/dev-scripts/build-osx.sh +++ b/samples/CSharpAvalonia/dev-scripts/build-osx.sh @@ -14,18 +14,19 @@ BUILD_VERSION="$1" RELEASE_DIR="$SCRIPT_DIR/../releases" PUBLISH_DIR="$SCRIPT_DIR/../publish" +cd "$SCRIPT_DIR/../../.." + echo "" echo "Building Velopack Rust" -cd "$SCRIPT_DIR/../../../src/Rust" cargo build echo "" echo "Building Velopack Vpk" -cd "$SCRIPT_DIR/../../.." -dotnet build src/Velopack.Vpk/Velopack.Vpk.csproj +dotnet build src/vpk/Velopack.Vpk/Velopack.Vpk.csproj + +cd "$SCRIPT_DIR/.." echo "" -cd "$SCRIPT_DIR/.." echo "Compiling VelopackCSharpAvalonia with dotnet..." dotnet publish -c Release --self-contained -r osx-x64 -o "$PUBLISH_DIR" -p:UseLocalVelopack=true diff --git a/samples/CSharpAvalonia/dev-scripts/build-win.bat b/samples/CSharpAvalonia/dev-scripts/build-win.bat index d3199ae7..29899598 100644 --- a/samples/CSharpAvalonia/dev-scripts/build-win.bat +++ b/samples/CSharpAvalonia/dev-scripts/build-win.bat @@ -12,15 +12,15 @@ if "%~1"=="" ( exit /b 1 ) +cd %~dp0..\..\..\ + echo. echo Building Velopack Rust -cd %~dp0..\..\..\src\Rust cargo build --features windows echo. echo Building Velopack Vpk -cd %~dp0..\..\..\ -dotnet build src/Velopack.Vpk/Velopack.Vpk.csproj +dotnet build src/vpk/Velopack.Vpk/Velopack.Vpk.csproj cd %~dp0.. set "version=%~1"