From faf6618f3b49186b91b79790e732abaf29c272ef Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 7 Dec 2020 21:01:28 -0700 Subject: [PATCH] fix not restoring packages based on rid --- publish.ps1 | 5 +++-- publish.sh | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/publish.ps1 b/publish.ps1 index 0c77ac6..040a591 100644 --- a/publish.ps1 +++ b/publish.ps1 @@ -5,8 +5,9 @@ $target="win10-x64" $version=$proj.Project.PropertyGroup.VersionPrefix $release_name="min-ed-launcher_v${version}_$target" -dotnet publish src\MinEdLauncher\MinEdLauncher.fsproj -r "$target" --self-contained true -o "artifacts\$release_name" -c ReleaseWindows -p:PublishSingleFile=true -dotnet publish src\MinEdLauncher.Bootstrap\MinEdLauncher.Bootstrap.csproj -r "$target" --self-contained true -o "artifacts\$release_name" -c Release +dotnet restore -r $target +dotnet publish src\MinEdLauncher\MinEdLauncher.fsproj -r "$target" --self-contained true --no-restore -o "artifacts\$release_name" -c ReleaseWindows -p:PublishSingleFile=true +dotnet publish src\MinEdLauncher.Bootstrap\MinEdLauncher.Bootstrap.csproj -r "$target" --self-contained true --no-restore -o "artifacts\$release_name" -c Release cp README.md "artifacts\$release_name" rm "artifacts\$release_name\*" -include *.json, *.pdb diff --git a/publish.sh b/publish.sh index f7d2125..3a600fc 100755 --- a/publish.sh +++ b/publish.sh @@ -4,7 +4,8 @@ target="linux-x64" version=$(grep -oPm1 "(?<=)[^<]+" src/Directory.Build.props) # use something like xml_grep if this regex becomes a problem release_name="min-ed-launcher_v${version}_$target" -dotnet publish src/MinEdLauncher/MinEdLauncher.fsproj -r "$target" --self-contained true -o "artifacts/$release_name" -c Release -p:PublishSingleFile=true +dotnet restore -r $target +dotnet publish src/MinEdLauncher/MinEdLauncher.fsproj -r "$target" --self-contained true --no-restore -o "artifacts/$release_name" -c Release -p:PublishSingleFile=true cp README.md "artifacts/$release_name" rm artifacts/"$release_name"/*.pdb