jonas
/
MultiTerm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added application icon,

Browse Source 
added version item in menu,
added installer config,
changes for installer to work
master
Jonas Arnold 3 years ago
parent 1136b322d2
commit 2dc2db70d6
8 changed files with 133 additions and 45 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      .gitignore
  2. 4
      MultiTerm.Protocols/MultiTerm.Protocols.csproj
  3. BIN
      MultiTerm.Wpf/Assets/console.ico
  4. 107
      MultiTerm.Wpf/MultiTerm.Wpf.csproj
  5. 58
      MultiTerm.Wpf/Properties/PublishProfiles/ClickOnceProfile.pubxml
  6. 1
      MultiTerm.Wpf/View/ShellView.xaml
  7. 4
      MultiTerm.Wpf/View/ShellView.xaml.cs
  8. 2
      MultiTerm.sln

2
.gitignore vendored
Unescape View File

@ -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

4
MultiTerm.Protocols/MultiTerm.Protocols.csproj
Unescape View File

@ -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>

BIN
MultiTerm.Wpf/Assets/console.ico
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

107
MultiTerm.Wpf/MultiTerm.Wpf.csproj
Unescape View File

@ -1,45 +1,70 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
<None Remove="Assets\mdi-console-white.png" />
<None Remove="Assets\mdi-import.png" />
<None Remove="Assets\mdi-keyboard.png" />
<None Remove="Assets\mdi-network.png" />
<None Remove="Assets\mdi-serial-port.png" />
<None Remove="Assets\mid-serial-port.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\MultiTerm.Core\MultiTerm.Core.csproj" />
<ProjectReference Include="..\MultiTerm.Wpf.CustomControl\MultiTerm.Wpf.CustomControl.csproj" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\mdi-console-white.png" />
<Resource Include="Assets\mdi-import.png" />
<Resource Include="Assets\mdi-keyboard.png" />
<Resource Include="Assets\mdi-network.png" />
<Resource Include="Assets\mdi-serial-port.png" />
</ItemGroup>
<ItemGroup>
<Compile Update="View\SettingsView\TcpClientSettingsView.xaml.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
<ApplicationIcon>Assets\console.ico</ApplicationIcon>
<IsPublishable>True</IsPublishable>
</PropertyGroup>
<ItemGroup>
<None Remove="Assets\mdi-console-white.png" />
<None Remove="Assets\mdi-import.png" />
<None Remove="Assets\mdi-keyboard.png" />
<None Remove="Assets\mdi-network.png" />
<None Remove="Assets\mdi-serial-port.png" />
<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" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\MultiTerm.Core\MultiTerm.Core.csproj" />
<ProjectReference Include="..\MultiTerm.Wpf.CustomControl\MultiTerm.Wpf.CustomControl.csproj" />
</ItemGroup>
<ItemGroup>
<Resource Include="Assets\mdi-console-white.png" />
<Resource Include="Assets\mdi-import.png" />
<Resource Include="Assets\mdi-keyboard.png" />
<Resource Include="Assets\mdi-network.png" />
<Resource Include="Assets\mdi-serial-port.png" />
</ItemGroup>
<ItemGroup>
<Compile Update="View\SettingsView\TcpClientSettingsView.xaml.cs">
<SubType>Code</SubType>
</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>

58
MultiTerm.Wpf/Properties/PublishProfiles/ClickOnceProfile.pubxml
Unescape View File

@ -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>

1
MultiTerm.Wpf/View/ShellView.xaml
Unescape View File

@ -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>

4
MultiTerm.Wpf/View/ShellView.xaml.cs
Unescape View File

@ -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>

2
MultiTerm.sln
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save