From 83a6e262c4c18773893573f683622a13501bc1b7 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Mon, 26 Feb 2024 14:49:59 +0100 Subject: [PATCH] Updated release process to handle SDK style project files --- BuildTools/UpdateVersionStamp/Program.cs | 1 - build-release.sh | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/BuildTools/UpdateVersionStamp/Program.cs b/BuildTools/UpdateVersionStamp/Program.cs index 79c03cb58..51eecf798 100644 --- a/BuildTools/UpdateVersionStamp/Program.cs +++ b/BuildTools/UpdateVersionStamp/Program.cs @@ -16,7 +16,6 @@ namespace UpdateVersionStamp { var versionre = @"(?\d+\.\d+\.(\*|(\d+(\.(\*|\d+)))?))"; FILEMAP = new Dictionary(StringComparer.InvariantCultureIgnoreCase); - FILEMAP.Add("AssemblyInfo.cs", new Regex(@"(\[assembly\: AssemblyVersion\(\""" + versionre + @"""\)\])|(\[assembly\: AssemblyFileVersion\(\""" + versionre + @"\""\)\])|(\[assembly\: AssemblyFileVersionAttribute\(\""" + versionre + @"\""\)\])")); FILEMAP.Add("UpgradeData.wxi", new Regex(@"\<\?define ProductVersion\=\""" + versionre + @"\"" \?\>")); FILEMAP.Add("AssemblyRedirects.xml", new Regex(@"newVersion\=\""" + versionre + @"\""")); FILEMAP.Add("index.html", new Regex(@"\?v\=" + versionre)); diff --git a/build-release.sh b/build-release.sh index 23293a8fb..4404e3925 100644 --- a/build-release.sh +++ b/build-release.sh @@ -155,13 +155,13 @@ rm -rf "Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Release" "${XBUILD}" /p:Configuration=Debug "BuildTools/GnupgSigningTool/GnupgSigningTool.sln" -"${XBUILD}" /p:Configuration=Release /target:Clean "Duplicati.sln" +"${XBUILD}" /p:Configuration=Release /p:Version=${RELEASE_VERSION} /target:Clean "Duplicati.sln" find "Duplicati" -type d -name "Release" | xargs rm -rf if [ ! -d "$XAMARIN" ]; then read -p"Warning, this build will not enable tray icon on Mac, hit any key to continue." - "${XBUILD}" /p:DefineConstants=ENABLE_GTK /p:Configuration=Release "Duplicati.sln" + "${XBUILD}" /p:DefineConstants=ENABLE_GTK /p:Configuration=Release /p:Version=${RELEASE_VERSION} "Duplicati.sln" else - "${XBUILD}" -p:DefineConstants=\"ENABLE_GTK\;XAMARIN_MAC\" /p:Configuration=Release "Duplicati.sln" + "${XBUILD}" -p:DefineConstants=\"ENABLE_GTK\;XAMARIN_MAC\" /p:Configuration=Release /p:Version=${RELEASE_VERSION} "Duplicati.sln" fi BUILD_STATUS=$?