From 584fa7e6081bfe2c4069a8451cb61dbb3029a1e3 Mon Sep 17 00:00:00 2001
From: Marble Wu <huobazi@gmail.com>
Date: Fri, 3 Jul 2020 23:38:58 +0800
Subject: [PATCH] Update project path for publish script and add all Windows
 RIDs

---
 release.sh        | 10 +++++-----
 src/dackup.csproj |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/release.sh b/release.sh
index 19e1e64..759699b 100755
--- a/release.sh
+++ b/release.sh
@@ -31,21 +31,21 @@ readonly BASE_PWD=$PWD
 readonly SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
 readonly SRC_PATH=$SCRIPT_PATH/src
 readonly PROJECT_PATH=$SRC_PATH/dackup.csproj
-readonly DOTNET_CORE_APP_VERSION_FOLDER=$SRC_PATH/bin/release/netcoreapp3.1
+readonly DOTNET_CORE_APP_VERSION_FOLDER=$SRC_PATH/bin/Release/netcoreapp3.1
 
 
 rm -rf $SCRIPT_PATH/dist 
 mkdir $SCRIPT_PATH/dist
-rm -rf $SRC_PATH/bin/release 
+rm -rf $SRC_PATH/bin/Release 
 
-declare -a winOS=("win10-x64" "win-x64")
+declare -a winOS=("win10-x64" "win81-x64" "win7-x64" "win-x64")
 declare -a unixOS=("osx-x64" "linux-x64")
 declare -a releaseFiles=()
 
 for rid in "${winOS[@]}"
 do
     distFile="$SCRIPT_PATH/dist/dackup-$rid.zip"
-    cd $SRC_PATH && dotnet publish -c Release -p:PublishSingleFile=true /p:IncludeSymbolsInSingleFile=true -r $rid 
+    dotnet publish $PROJECT_PATH -c Release -p:PublishSingleFile=true /p:IncludeSymbolsInSingleFile=true -r $rid 
     cd $DOTNET_CORE_APP_VERSION_FOLDER/$rid/publish/
     zip -r $distFile .
     releaseFiles+=($distFile)
@@ -55,7 +55,7 @@ done
 for rid in "${unixOS[@]}"
 do 
     distFile="$SCRIPT_PATH/dist/dackup-$rid.zip"
-    cd $SRC_PATH && dotnet publish -c Release -p:PublishSingleFile=true /p:IncludeSymbolsInSingleFile=true -r $rid 
+    dotnet publish $PROJECT_PATH -c Release -p:PublishSingleFile=true /p:IncludeSymbolsInSingleFile=true -r $rid 
     cd $DOTNET_CORE_APP_VERSION_FOLDER/$rid/publish/
     tar -cvzf  $distFile *
     releaseFiles+=($distFile)
diff --git a/src/dackup.csproj b/src/dackup.csproj
index 7e166de..079de7b 100644
--- a/src/dackup.csproj
+++ b/src/dackup.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RuntimeIdentifiers>win10-x64;win-x64;osx-x64;linux-x64;</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win10-x64;win81-x64;win7-x64;win-x64;osx-x64;linux-x64;</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>