Merge branch 'master' into features/lock-files-view

Author: StanleyGoldman

common/SolutionInfo.cs

@@ -31,6 +31,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.32.0";
+        internal const string Version = "0.33.0";
     }
 }

generate-package.sh

@@ -1,40 +1,33 @@
 #!/bin/sh -eu
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ $# -lt 3 ]; then
-	echo "Usage: generate-package.sh [git|lfs|ghu] [version] [path to file] [host url (optional)] [release notes file (optional)] [message file (optional)]"
+	echo "Usage: generate-package.sh [git|lfs|ghu] [windows|mac|linux] [version] [path to file] [host url (optional)] [release notes file (optional)] [message file (optional)]"
 	exit 1
 fi
 
-LFS_MD5="d0d59164a4b7b35685502d7c5f747f2f"
-GIT_MD5="50570ed932559f294d1a1361801740b9"
-MD5=""
-
 URL="http://ghfvs-installer.github.com"
-if [ $# -ge 4 ]; then
-	URL=$4
+if [ $# -ge 5 ]; then
+	URL=$5
 fi
 
 if [ "$1" == "git" ]; then
-	MD5=$GIT_MD5
-	URL="$URL/unity/git"
+	URL="$URL/unity/git/$2"
 fi
 if [ "$1" == "lfs" ]; then
-	MD5=$LFS_MD5
-	URL="$URL/unity/git"
+	URL="$URL/unity/git/$2"
 fi
 if [ "$1" == "ghu" ]; then
-	MD5=
 	URL="$URL/unity/releases"
 fi
 
 RN=""
 MSG=""
-if [ $# -ge 5 ]; then
-	RN="$5"
+if [ $# -ge 6 ]; then
+	RN="$6"
 fi
 
-if [ $# -ge 6 ]; then
-	MSG="$6"
+if [ $# -ge 7 ]; then
+	MSG="$7"
 fi
 
 EXEC="mono"
@@ -46,4 +39,4 @@ if [ ! -e "$DIR/build/CommandLine/CommandLine.exe" ]; then
 	>&2 xbuild /target:CommandLine "$DIR/GitHub.Unity.sln" /verbosity:minimal
 fi
 
-"$EXEC""$DIR/build/CommandLine/CommandLine.exe" --gen-package --version "$2" --path "$3" --url "$URL" --md5 "$MD5" --rn "$RN" --msg "$MSG"
+"$EXEC""$DIR/build/CommandLine/CommandLine.exe" --gen-package --version "$3" --path "$4" --url "$URL" --rn "$RN" --msg "$MSG"