From 486163a79aca0ae6a285ae9f8fc49e9f3458321f Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 20 Oct 2022 20:01:31 -0600 Subject: [PATCH] fix linux only package being included in windows build when using publish.ps1 --- publish.ps1 | 3 +-- src/MinEdLauncher/MinEdLauncher.fsproj | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/publish.ps1 b/publish.ps1 index 3bed0a6..1749972 100644 --- a/publish.ps1 +++ b/publish.ps1 @@ -6,8 +6,7 @@ $version=$proj.Project.PropertyGroup.VersionPrefix $release_name="min-ed-launcher_v${version}_$target" $target_dir="artifacts\$release_name" -dotnet restore -r $target src\MinEdLauncher\MinEdLauncher.fsproj -dotnet publish src\MinEdLauncher\MinEdLauncher.fsproj -r "$target" --self-contained true --no-restore -o "$target_dir" -c ReleaseWindows -p:PublishSingleFile=true +dotnet publish -r "$target" --self-contained -o "$target_dir" -c ReleaseWindows -p:PublishSingleFile=true src\MinEdLauncher\MinEdLauncher.fsproj $full_version=(Get-Item "$target_dir\MinEdLauncher.exe").VersionInfo.ProductVersion (Get-Content Cargo.toml).replace('0.0.0', "$full_version") | Set-Content Cargo.toml # Workaround for https://github.com/rust-lang/cargo/issues/6583 cargo build --release diff --git a/src/MinEdLauncher/MinEdLauncher.fsproj b/src/MinEdLauncher/MinEdLauncher.fsproj index d41c81a..faa7414 100644 --- a/src/MinEdLauncher/MinEdLauncher.fsproj +++ b/src/MinEdLauncher/MinEdLauncher.fsproj @@ -34,6 +34,10 @@ WINDOWS win10-x64 + + + !$(DefineConstants.Contains('WINDOWS')) + @@ -55,7 +59,7 @@ - + libsteam_api.so Always @@ -73,7 +77,7 @@ - +