added application icon,

added version item in menu,
added installer config,
changes for installer to work

.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

MultiTerm.Protocols/MultiTerm.Protocols.csproj

@@ -13,12 +13,12 @@
 
   <ItemGroup>
     <EmbeddedResource Include="UsbHid\hidapi.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  <!-- directly to output folder, do not create subfolder UsbHid -->
 	  <TargetPath>%(Filename)%(Extension)</TargetPath>
 	</EmbeddedResource>
     <EmbeddedResource Include="UsbHid\hidapi.lib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <!-- directly to output folder, do not create subfolder UsbHid -->
 	  <TargetPath>%(Filename)%(Extension)</TargetPath>
 	</EmbeddedResource>

MultiTerm.Wpf/MultiTerm.Wpf.csproj

@@ -5,6 +5,8 @@
 		<TargetFramework>net6.0-windows</TargetFramework>
 		<Nullable>enable</Nullable>
 		<UseWPF>true</UseWPF>
+		<ApplicationIcon>Assets\console.ico</ApplicationIcon>
+		<IsPublishable>True</IsPublishable>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -16,6 +18,19 @@
 		<None Remove="Assets\mid-serial-port.png" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<Content Include="Assets\console.ico" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Content Include="..\MultiTerm.Protocols\UsbHid\hidapi.dll" Link="hidapi.dll">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+		<Content Include="..\MultiTerm.Protocols\UsbHid\hidapi.lib" Link="hidapi.lib">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
@@ -42,4 +57,14 @@
 		</Compile>
 	</ItemGroup>
 
+	<!-- Overwrite AssemblyVersion with Published version, since in NET6 there is no access to the ApplicationDeployment class-->
+	<Target Name="SetAssemblyVersion" BeforeTargets="BeforeCompile">
+		<FormatVersion Version="$(ApplicationVersion)" Revision="$(ApplicationRevision)">
+			<Output PropertyName="AssemblyVersion" TaskParameter="OutputVersion" />
+		</FormatVersion>
+		<FormatVersion Version="$(ApplicationVersion)" Revision="$(ApplicationRevision)">
+			<Output PropertyName="FileVersion" TaskParameter="OutputVersion" />
+		</FormatVersion>
+	</Target>
+
 </Project>

MultiTerm.Wpf/Properties/PublishProfiles/ClickOnceProfile.pubxml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <ApplicationRevision>11</ApplicationRevision>
+    <ApplicationVersion>1.0.0.*</ApplicationVersion>
+    <BootstrapperEnabled>True</BootstrapperEnabled>
+    <Configuration>Release</Configuration>
+    <CreateDesktopShortcut>True</CreateDesktopShortcut>
+    <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
+    <GenerateManifests>true</GenerateManifests>
+    <Install>True</Install>
+    <InstallFrom>Web</InstallFrom>
+    <InstallUrl>http://multiterm.iet-hslu.ch/installer/</InstallUrl>
+    <IsRevisionIncremented>True</IsRevisionIncremented>
+    <IsWebBootstrapper>True</IsWebBootstrapper>
+    <MapFileExtensions>True</MapFileExtensions>
+    <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
+    <Platform>Any CPU</Platform>
+    <ProductName>MultiTerm</ProductName>
+    <PublishDir>bin\Release\net6.0-windows\app.publish\</PublishDir>
+    <PublishUrl>bin\publish\</PublishUrl>
+    <PublisherName>HSLU IET</PublisherName>
+    <PublishProtocol>ClickOnce</PublishProtocol>
+    <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishSingleFile>False</PublishSingleFile>
+    <SelfContained>False</SelfContained>
+    <SignatureAlgorithm>sha256RSA</SignatureAlgorithm>
+    <SignManifests>True</SignManifests>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UpdateEnabled>True</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateRequired>False</UpdateRequired>
+    <WebPageFileName>index.html</WebPageFileName>
+    <ManifestCertificateThumbprint>BC1274DD90DC13A3CE1634A82AC005CDB6852B06</ManifestCertificateThumbprint>
+    <ManifestKeyFile>MultiTerm.Wpf_TemporaryKey.pfx</ManifestKeyFile>
+    <History>True|2023-05-31T10:15:48.2252015Z;</History>
+  </PropertyGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.NetCore.DesktopRuntime.6.0.x64">
+      <Install>true</Install>
+      <ProductName>.NET Desktop Runtime 6.0.16 (x64)</ProductName>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <PublishFile Include="Assets\console.ico">
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>true</IncludeHash>
+      <FileType>File</FileType>
+    </PublishFile>
+  </ItemGroup>
+</Project>

MultiTerm.Wpf/View/ShellView.xaml

@@ -77,6 +77,7 @@
             <!--<MenuItem Header="_View"/>-->
             <MenuItem Header="_Help">
                 <MenuItem Header="Logfiles" Click="MenuItem_Logfiles_Click"/>
+                <MenuItem x:Name="versionMenuItem" StaysOpenOnClick="True"/>
                 <!--<MenuItem Header="About MultiTerm"/>-->
             </MenuItem>
         </Menu>

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}";
     }
 
     /// <summary>

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