From 4ff09fd161e673db107764913e6268b6e5e7a996 Mon Sep 17 00:00:00 2001 From: BinaryConstruct Date: Mon, 19 Apr 2021 21:20:22 -0500 Subject: [PATCH] Version bump 4.3.0 --- build.ps1 | 13 +- installer.nsi | 104 --------------- src/Setup/Program.cs | 15 ++- src/TEdit.sln | 2 - .../Editor/Plugins/HouseGenPluginView.xaml | 126 +++++++++++------- src/TEdit/TEdit.csproj | 2 +- src/TEdit/View/NotificationsWindow.xaml | 10 ++ 7 files changed, 113 insertions(+), 159 deletions(-) delete mode 100644 installer.nsi diff --git a/build.ps1 b/build.ps1 index f2b17039..8da28480 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,5 +1,5 @@ param( - [string] $VersionPrefix = "4.2.8", + [string] $VersionPrefix = "4.3.0", [string] $VersionSuffix = $null ) @@ -22,15 +22,18 @@ if ($null -ne $VersionSuffix) { Remove-Item -Path ".\release" -Recurse -Force Remove-Item -Path ".\TEdit*.zip" +Remove-Item -Path ".\TEdit*.msi" mkdir -Path ".\release" Copy-Item -Path ".\src\TEdit\bin\Release\net462\publish" -Destination ".\release\TEdit-$VersionPrefix\" -Recurse -Force Copy-Item -Path ".\schematics" -Destination ".\release" -Recurse -# Create ZIP Release -Compress-Archive -Path ".\release\*" -DestinationPath ".\TEdit$VersionPrefix.zip" - # Create Installer +$env:VERSION_PREFIX = $VersionPrefix +& dotnet build -c Release ".\src\Setup\Setup.csproj" +signtool.exe sign /v /fd sha256 /n "BC Code Signing" /t http://timestamp.digicert.com ".\src\Setup\TEdit-$VersionPrefix.msi" +Move-Item ".\src\Setup\TEdit-$VersionPrefix.msi" ".\" -#Compress-Archive -Path ".\src\TEdit\bin\Release\net462\publish\*" -DestinationPath ".\TEdit$VersionPrefix-$VersionSuffix.zip" +# Create ZIP Release +Compress-Archive -Path ".\release\*" -DestinationPath ".\TEdit-$VersionPrefix.zip" \ No newline at end of file diff --git a/installer.nsi b/installer.nsi deleted file mode 100644 index d241bde8..00000000 --- a/installer.nsi +++ /dev/null @@ -1,104 +0,0 @@ -;NSIS Modern User Interface -;Start Menu Folder Selection Example Script -;Written by Joost Verburg - -;-------------------------------- -;Include Modern UI - - !include "MUI2.nsh" - -;-------------------------------- -;Variables - - Var StartMenuFolder - -;-------------------------------- -;General - - ;Name and file - Name "TEdit ${VERSION}" - OutFile "TEdit-${VERSION}-Setup.exe" - Unicode True - - ;Default installation folder - InstallDir "$LOCALAPPDATA\TEdit" - - ;Get installation folder from registry if available - InstallDirRegKey HKCU "Software\TEdit" "" - - ;Request application privileges for Windows Vista - RequestExecutionLevel user - - - -;-------------------------------- -;Interface Settings - - !define MUI_ABORTWARNING - -;-------------------------------- -;Pages - - ;Start Menu Folder Page Configuration - !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" - !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\TEdit" - !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" - - !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder - - !insertmacro MUI_PAGE_INSTFILES - - !insertmacro MUI_UNPAGE_CONFIRM - !insertmacro MUI_UNPAGE_INSTFILES - -;-------------------------------- -;Languages - - !insertmacro MUI_LANGUAGE "English" - -;-------------------------------- -;Installer Sections - -Section "Application" SecDummy - - SetOutPath "$INSTDIR" - - ;ADD YOUR OWN FILES HERE... - File /r ".\release\TEdit-${VERSION}" - - ;Store installation folder - WriteRegStr HKCU "Software\TEdit" "" $INSTDIR - - ;Create uninstaller - WriteUninstaller "$INSTDIR\Uninstall.exe" - - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - - ;Create shortcuts - CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortcut "$SMPROGRAMS\$StartMenuFolder\TEdit4.lnk" "$INSTDIR\TEdit-${VERSION}\TEdit.exe" - CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" - - !insertmacro MUI_STARTMENU_WRITE_END - -SectionEnd - -;-------------------------------- -;Uninstaller Section - -Section "Uninstall" - - ;ADD YOUR OWN FILES HERE... - - Delete "$INSTDIR\Uninstall.exe" - - RMDir "$INSTDIR" - - !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder - - Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" - RMDir "$SMPROGRAMS\$StartMenuFolder" - - DeleteRegKey /ifempty HKCU "Software\TEdit" - -SectionEnd \ No newline at end of file diff --git a/src/Setup/Program.cs b/src/Setup/Program.cs index b98cf87e..f2d903c5 100644 --- a/src/Setup/Program.cs +++ b/src/Setup/Program.cs @@ -5,7 +5,19 @@ class Script { static public void Main(string[] args) { - var version = "4.2.8"; + var version = "4.0.0"; + + try + { + var envronmentVarVersion = Environment.GetEnvironmentVariable("VERSION_PREFIX"); + if (!string.IsNullOrWhiteSpace(envronmentVarVersion)) + { + version = envronmentVarVersion; + } + } + catch { /* ignore error and use previous variable */ } + + var binPath = $@"..\..\release\TEdit-{version}"; var schematicPath = $@"..\..\release\schematics"; @@ -51,7 +63,6 @@ static public void Main(string[] args) project.ControlPanelInfo.InstallLocation = "[INSTALLDIR]"; project.ControlPanelInfo.NoModify = true; - Compiler.BuildMsi(project, $"TEdit-{version}.msi"); } } \ No newline at end of file diff --git a/src/TEdit.sln b/src/TEdit.sln index 45094693..bed52946 100644 --- a/src/TEdit.sln +++ b/src/TEdit.sln @@ -22,9 +22,7 @@ Global {7F36653F-68C7-4D5C-A88A-6279DBE8A0C8}.Debug|Any CPU.ActiveCfg = Debug|x86 {7F36653F-68C7-4D5C-A88A-6279DBE8A0C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA287E0D-9BC9-4E3C-8AC0-55A87613CEC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA287E0D-9BC9-4E3C-8AC0-55A87613CEC1}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA287E0D-9BC9-4E3C-8AC0-55A87613CEC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA287E0D-9BC9-4E3C-8AC0-55A87613CEC1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/TEdit/Editor/Plugins/HouseGenPluginView.xaml b/src/TEdit/Editor/Plugins/HouseGenPluginView.xaml index 1712f4cc..99e68ad7 100644 --- a/src/TEdit/Editor/Plugins/HouseGenPluginView.xaml +++ b/src/TEdit/Editor/Plugins/HouseGenPluginView.xaml @@ -1,46 +1,82 @@ - - - - - - -