Version bump 4.3.0

TEdit · Apr 20, 2021 · 4ff09fd · 4ff09fd
1 parent 126fcc8
commit 4ff09fd
Show file tree

Hide file tree

Showing 7 changed files with 113 additions and 159 deletions.
diff --git 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"
diff --git a/installer.nsi b/installer.nsi
diff --git 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");
     }
 }
diff --git 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
@@ -1,46 +1,82 @@
-<Window x:Class="TEdit.Editor.Plugins.HouseGenPluginView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-        SizeToContent="WidthAndHeight"
-        Closing="WindowClosing"
-        Title="House Generator" 
-        ResizeMode="NoResize" 
-        WindowStartupLocation="CenterOwner" 
-        Icon="/TEdit;component/Images/tedit.ico"
-        Background="{StaticResource WindowBackgroundBrush}" 
-        Foreground="{StaticResource TextBrush}" 
-        >
-    <StackPanel>
-        <Image Source="{Binding Path=Preview}" Margin="10" HorizontalAlignment="Stretch" Stretch="Uniform" RenderOptions.BitmapScalingMode="NearestNeighbor" Width="400" Height="400" />
-        <StackPanel Background="{StaticResource ControlBackgroundBrush}" Orientation="Horizontal">
-            <ComboBox ItemsSource="{Binding Path=HouseGenTemplates}" 
-                      SelectedValue="{Binding Path=SelectedTemplate, Mode=TwoWay}"
-                      DisplayMemberPath="Name"
-                      Text="Click [...] to Import Template Schematic"
-                      Margin="5" Padding="25,3" 
-                      HorizontalAlignment="Stretch"
-                      MinWidth="400"
-                      Focusable="True" 
-                      IsReadOnly="True"
-                      IsEditable="True">
-            </ComboBox>
-            <Button Content="..." Command="{Binding Path=ImportCommand}" Margin="5" Padding="10, 3" HorizontalAlignment="Right" VerticalAlignment="Center" />
-        </StackPanel>
-        <StackPanel Background="{StaticResource ControlBackgroundBrush}">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"></ColumnDefinition>
-                    <ColumnDefinition Width="*"></ColumnDefinition>
-                    <ColumnDefinition Width="*"></ColumnDefinition>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*"></RowDefinition>
-                    <RowDefinition Height="*"></RowDefinition>
-                </Grid.RowDefinitions>
-                <Button Content="Cancel" Click="CancelButtonClick" Grid.Row="1" Grid.Column="0" Margin="5" Padding="15, 3" HorizontalAlignment="Left" VerticalAlignment="Center" />
-                <Button Content="Generate" Command="{Binding Path=GenerateCommand}" Grid.Row="0" Grid.Column="1"  Grid.RowSpan="2" Margin="5" Padding="15, 3"  HorizontalAlignment="Center"  VerticalAlignment="Stretch" Height="30" Width="120" />
-                <Button Content="Copy" Command="{Binding Path=CopyCommand}" Grid.Column="2" Grid.Row="1" Margin="5" Padding="15, 3" HorizontalAlignment="Right" VerticalAlignment="Center" />
-            </Grid>
-        </StackPanel>
-    </StackPanel>
+<Window x:Class="TEdit.Editor.Plugins.HouseGenPluginView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+        SizeToContent="WidthAndHeight"
+        Closing="WindowClosing"
+        Title="House Generator" 
+        ResizeMode="NoResize" 
+        WindowStartupLocation="CenterOwner" 
+        Icon="/TEdit;component/Images/tedit.ico"
+        Background="{StaticResource WindowBackgroundBrush}" 
+        Foreground="{StaticResource TextBrush}" 
+        >
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="160" />
+        </Grid.ColumnDefinitions>
+        <StackPanel Grid.Column="1">
+            <Label>Zone 1 Description (Group 1)</Label>
+            <DockPanel>
+                <Slider Value="3" VerticalAlignment="Center"  Minimum="0" Maximum="5" SmallChange="1" Width="120" />
+                <TextBox Text="3" Width="32" DockPanel.Dock="Right" />
+            </DockPanel>
+            <Label>Zone 2 Description (Group 1)</Label>
+            <DockPanel>
+                <Slider Value="3" VerticalAlignment="Center"  Minimum="0" Maximum="5" SmallChange="1" Width="120" />
+                <TextBox Text="3" Width="32" DockPanel.Dock="Right" />
+            </DockPanel>
+            <Label>Zone 3</Label>
+            <DockPanel>
+                <Slider Value="2" VerticalAlignment="Center"  Minimum="0" Maximum="5" SmallChange="1" Width="120" />
+                <TextBox Text="2" Width="32" DockPanel.Dock="Right" />
+            </DockPanel>
+            <CheckBox IsChecked="True">Synchronize Groups</CheckBox>
+            <GridSplitter Margin="0,10" Background="{StaticResource ControlBackgroundBrush}" BorderBrush="{StaticResource ControlBackgroundBrush}"></GridSplitter>
+            <Label>Schematics</Label>
+            <StackPanel Orientation="Horizontal">
+                <Button Content="Add" Padding="10, 3" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                <Button Content="Save" Padding="10, 3" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                <Button Content="Save As" Padding="10, 3" HorizontalAlignment="Left" VerticalAlignment="Center" />
+            </StackPanel>
+            <ItemsControl Background="{StaticResource ControlBackgroundBrush}" HorizontalAlignment="Stretch" Height="100" />
+            <Button Content="x" Padding="15, 3" HorizontalAlignment="Left" VerticalAlignment="Center" />
+            <ItemsControl Background="{StaticResource ControlBackgroundBrush}" HorizontalAlignment="Stretch" Height="100" />
+            <Button Content="X" Padding="15, 3" HorizontalAlignment="Left" VerticalAlignment="Center" />
+        </StackPanel>
+        <StackPanel Grid.Column="0">
+            <Label>Preview</Label>
+            <Image Source="{Binding Path=Preview}" Margin="10" HorizontalAlignment="Stretch" Stretch="Uniform" RenderOptions.BitmapScalingMode="NearestNeighbor" Width="400" Height="400" />
+            <StackPanel Background="{StaticResource ControlBackgroundBrush}" Orientation="Horizontal">
+                <ComboBox ItemsSource="{Binding Path=HouseGenTemplates}" 
+                      SelectedValue="{Binding Path=SelectedTemplate, Mode=TwoWay}"
+                      DisplayMemberPath="Name"
+                      Text="Click [...] to Import Template Schematic"
+                      Margin="5" Padding="25,3" 
+                      HorizontalAlignment="Stretch"
+                      MinWidth="400"
+                      Focusable="True" 
+                      IsReadOnly="True"
+                      IsEditable="True">
+                </ComboBox>
+                <Button Content="..." Command="{Binding Path=ImportCommand}" Margin="5" Padding="10, 3" HorizontalAlignment="Right" VerticalAlignment="Center" />
+            </StackPanel>
+            <StackPanel Background="{StaticResource ControlBackgroundBrush}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"></ColumnDefinition>
+                        <ColumnDefinition Width="*"></ColumnDefinition>
+                        <ColumnDefinition Width="*"></ColumnDefinition>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="*"></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Button Content="Cancel" Click="CancelButtonClick" Grid.Row="1" Grid.Column="0" Margin="5" Padding="15, 3" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                    <Button Content="Generate" Command="{Binding Path=GenerateCommand}" Grid.Row="0" Grid.Column="1"  Grid.RowSpan="2" Margin="5" Padding="15, 3"  HorizontalAlignment="Center"  VerticalAlignment="Stretch" Height="30" Width="120" />
+                    <Button Content="Copy" Command="{Binding Path=CopyCommand}" Grid.Column="2" Grid.Row="1" Margin="5" Padding="15, 3" HorizontalAlignment="Right" VerticalAlignment="Center" />
+                </Grid>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
 </Window>
diff --git a/src/TEdit/TEdit.csproj b/src/TEdit/TEdit.csproj
@@ -9,7 +9,7 @@
     <DefaultNamespace>TEdit</DefaultNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
-    <VersionPrefix>4.2.8</VersionPrefix>
+    <VersionPrefix>4.3.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Platforms>AnyCPU</Platforms>
     <ApplicationManifest>app.manifest</ApplicationManifest>

diff --git a/src/TEdit/View/NotificationsWindow.xaml b/src/TEdit/View/NotificationsWindow.xaml
@@ -34,6 +34,16 @@
                         <Bold>Release Notes</Bold>
                     </Paragraph>
 
+                    <Paragraph>Version 4.3.0</Paragraph>
+                    <List>
+                        <ListItem>
+                            <Paragraph>Package as MSI installer.</Paragraph>
+                        </ListItem>
+                        <ListItem>
+                            <Paragraph>Fix for Replace All Tiles/Wall Plugin.</Paragraph>
+                        </ListItem>
+                    </List>
+
                     <Paragraph>Version 4.2.8</Paragraph>
                     <List>
                         <ListItem>