From 2dc2db70d66a9bf8cd8ca2bbf8ba95812c189bc5 Mon Sep 17 00:00:00 2001 From: Jonas Arnold Date: Wed, 31 May 2023 14:35:55 +0200 Subject: [PATCH] added application icon, added version item in menu, added installer config, changes for installer to work --- .gitignore | 2 +- .../MultiTerm.Protocols.csproj | 4 +- MultiTerm.Wpf/Assets/console.ico | Bin 0 -> 3162 bytes MultiTerm.Wpf/MultiTerm.Wpf.csproj | 107 +++++++++++------- .../PublishProfiles/ClickOnceProfile.pubxml | 58 ++++++++++ MultiTerm.Wpf/View/ShellView.xaml | 1 + MultiTerm.Wpf/View/ShellView.xaml.cs | 4 + MultiTerm.sln | 2 +- 8 files changed, 133 insertions(+), 45 deletions(-) create mode 100644 MultiTerm.Wpf/Assets/console.ico create mode 100644 MultiTerm.Wpf/Properties/PublishProfiles/ClickOnceProfile.pubxml diff --git a/.gitignore b/.gitignore index 9491a2f..a662b69 100644 --- a/.gitignore +++ b/.gitignore @@ -184,7 +184,7 @@ publish/ *.azurePubxml # Note: Comment the next line if you want to checkin your web deploy settings, # but database connection strings (with potential passwords) will be unencrypted -*.pubxml +#*.pubxml *.publishproj # Microsoft Azure Web App publish settings. Comment the next line if you want to diff --git a/MultiTerm.Protocols/MultiTerm.Protocols.csproj b/MultiTerm.Protocols/MultiTerm.Protocols.csproj index 2a81e61..0d16cdc 100644 --- a/MultiTerm.Protocols/MultiTerm.Protocols.csproj +++ b/MultiTerm.Protocols/MultiTerm.Protocols.csproj @@ -13,12 +13,12 @@ - PreserveNewest + Always %(Filename)%(Extension) - PreserveNewest + Always %(Filename)%(Extension) diff --git a/MultiTerm.Wpf/Assets/console.ico b/MultiTerm.Wpf/Assets/console.ico new file mode 100644 index 0000000000000000000000000000000000000000..e3722d9620795a89b2d45bb5da6f5ddd21ac8cdb GIT binary patch literal 3162 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 G@Bad+hE?kT literal 0 HcmV?d00001 diff --git a/MultiTerm.Wpf/MultiTerm.Wpf.csproj b/MultiTerm.Wpf/MultiTerm.Wpf.csproj index 86713c1..9fc5953 100644 --- a/MultiTerm.Wpf/MultiTerm.Wpf.csproj +++ b/MultiTerm.Wpf/MultiTerm.Wpf.csproj @@ -1,45 +1,70 @@  - - WinExe - net6.0-windows - enable - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - + + WinExe + net6.0-windows + enable + true + Assets\console.ico + True + + + + + + + + + + + + + + + + + + Always + + + Always + + + + + + + + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + diff --git a/MultiTerm.Wpf/Properties/PublishProfiles/ClickOnceProfile.pubxml b/MultiTerm.Wpf/Properties/PublishProfiles/ClickOnceProfile.pubxml new file mode 100644 index 0000000..5dcae9d --- /dev/null +++ b/MultiTerm.Wpf/Properties/PublishProfiles/ClickOnceProfile.pubxml @@ -0,0 +1,58 @@ + + + + + 11 + 1.0.0.* + True + Release + True + True + true + True + Web + http://multiterm.iet-hslu.ch/installer/ + True + True + True + False + Any CPU + MultiTerm + bin\Release\net6.0-windows\app.publish\ + bin\publish\ + HSLU IET + ClickOnce + False + False + False + sha256RSA + True + net6.0-windows + True + Foreground + False + index.html + BC1274DD90DC13A3CE1634A82AC005CDB6852B06 + MultiTerm.Wpf_TemporaryKey.pfx + True|2023-05-31T10:15:48.2252015Z; + + + + true + .NET Desktop Runtime 6.0.16 (x64) + + + + + + + + + Include + true + File + + + \ No newline at end of file diff --git a/MultiTerm.Wpf/View/ShellView.xaml b/MultiTerm.Wpf/View/ShellView.xaml index 9ebcc5c..3c5f278 100644 --- a/MultiTerm.Wpf/View/ShellView.xaml +++ b/MultiTerm.Wpf/View/ShellView.xaml @@ -77,6 +77,7 @@ + diff --git a/MultiTerm.Wpf/View/ShellView.xaml.cs b/MultiTerm.Wpf/View/ShellView.xaml.cs index 92a7e59..b8134f4 100644 --- a/MultiTerm.Wpf/View/ShellView.xaml.cs +++ b/MultiTerm.Wpf/View/ShellView.xaml.cs @@ -1,6 +1,7 @@ using MultiTerm.Core.ViewModel; using System.Diagnostics; using System.IO; +using System.Reflection; using System.Windows.Controls; namespace MultiTerm.Wpf.View; @@ -11,6 +12,9 @@ public partial class ShellView : UserControl { InitializeComponent(); this.DataContext = App.AppHost!.Services.GetService(typeof(ShellViewModel)); + + // set version item header + this.versionMenuItem.Header = $"MultiTerm Version {Assembly.GetExecutingAssembly().GetName().Version}"; } /// diff --git a/MultiTerm.sln b/MultiTerm.sln index bffee60..83f2384 100644 --- a/MultiTerm.sln +++ b/MultiTerm.sln @@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiTerm.Wpf.CustomControl EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiTerm.Protocols", "MultiTerm.Protocols\MultiTerm.Protocols.csproj", "{D35B996A-91EE-4A6A-BA82-C74684AF4572}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiTerm.Protocols.Tests", "MultiTerm.Core.Tests\MultiTerm.Protocols.Tests.csproj", "{E75D3FF4-61FB-4A7F-A75D-B9E69A2FAE78}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiTerm.Protocols.Tests", "MultiTerm.Core.Tests\MultiTerm.Protocols.Tests.csproj", "{E75D3FF4-61FB-4A7F-A75D-B9E69A2FAE78}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution