diff --git a/Dist/.InvokeCLIOnMainSln.sh b/Dist/.InvokeCLIOnMainSln.sh index 18022fd30a..9b1e1b566e 100755 --- a/Dist/.InvokeCLIOnMainSln.sh +++ b/Dist/.InvokeCLIOnMainSln.sh @@ -10,4 +10,6 @@ config="$1" shift if [ -z "$NUGET_PACKAGES" ]; then export NUGET_PACKAGES="$HOME/.nuget/packages"; fi printf "running 'dotnet %s' in %s configuration, extra args: %s\n" "$cmd" "$config" "$*" -dotnet "$cmd" BizHawk.sln -c "$config" -m -clp:NoSummary "$@" +version=$(grep -Po "MainVersion = \"\K(.*)(?=\")" src/BizHawk.Common/VersionInfo.cs) +git_hash=$(git rev-parse --verify HEAD) +dotnet "$cmd" BizHawk.sln -c "$config" -m -clp:NoSummary -p:Version="$version" -p:SourceRevisionId="$git_hash" "$@" diff --git a/Dist/QuickTestBuildAndPackage_Developer.bat b/Dist/QuickTestBuildAndPackage_Developer.bat index d1de6ef2eb..c75a26a9cf 100644 --- a/Dist/QuickTestBuildAndPackage_Developer.bat +++ b/Dist/QuickTestBuildAndPackage_Developer.bat @@ -1,2 +1,2 @@ -start fart "..\Version\VersionInfo.cs" "DeveloperBuild = false" "DeveloperBuild = true" +start fart "..\src\BizHawk.Common\VersionInfo.cs" "DeveloperBuild = false" "DeveloperBuild = true" call QuickTestBuildAndPackage BizHawk-Developer.zip diff --git a/Dist/QuickTestBuildAndPackage_Release.bat b/Dist/QuickTestBuildAndPackage_Release.bat index b5ac448dcc..89a70e139e 100644 --- a/Dist/QuickTestBuildAndPackage_Release.bat +++ b/Dist/QuickTestBuildAndPackage_Release.bat @@ -1,3 +1,3 @@ -start fart "..\Version\VersionInfo.cs" "DeveloperBuild = true" "DeveloperBuild = false" +start fart "..\src\BizHawk.Common\VersionInfo.cs" "DeveloperBuild = true" "DeveloperBuild = false" call QuickTestBuildAndPackage.bat -start fart "..\Version\VersionInfo.cs" "DeveloperBuild = false" "DeveloperBuild = true" +start fart "..\src\BizHawk.Common\VersionInfo.cs" "DeveloperBuild = false" "DeveloperBuild = true"