Skip to content

Commit

Permalink
Project links added to About page.
Browse files Browse the repository at this point in the history
  • Loading branch information
lemalcs committed Jun 20, 2021
1 parent e72ebc6 commit 23ffc25
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
ResourceDictionaryLocation.SourceAssembly
)]

[assembly: AssemblyVersion("0.15.12")]
[assembly: AssemblyFileVersion("0.15.12")]
[assembly: AssemblyVersion("0.16.0")]
[assembly: AssemblyFileVersion("0.16.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set release_directory=..\\..\\..\\bin\\Releases
IF not exist %release_directory% mkdir %release_directory%

rem Create squirrel installer (nuget package)
set package_version=0.15.12
set package_version=0.16.0
set package_name=Khernet
%~dp0..\..\..\tools\squirrel.exe --releasify %package_name%.%package_version%.nupkg --releaseDir=%release_directory% --no-msi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Khernet</id>
<version>0.15.12</version>
<version>0.16.0</version>
<title></title>
<authors>Luis Lema</authors>
<owners>Luis Lema</owners>
Expand Down
4 changes: 2 additions & 2 deletions Khernet.Installer/installer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "installer"
version = "0.15.12"
version = "0.16.0"
authors = ["Luis <info@lemaluis.com>"]
edition = "2018"

Expand All @@ -25,5 +25,5 @@ LegalCopyright = "Copyright © 2021"
InternalName = "Khernet"
OriginalFilename = "Khernet"
ProductName = "Khernet"
ProductVersion = "0.15.12.0"
ProductVersion = "0.16.0.0"
FileDescription = "Standalone chat application for LAN"
2 changes: 1 addition & 1 deletion Khernet.Installer/installer/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn main()
res.set_icon(&source_icon_path);

// Version must be equals to APP_VERSION variable located in main.rs
res.set_version_info(winres::VersionInfo::FILEVERSION, 0x0000000F000C0000);
res.set_version_info(winres::VersionInfo::FILEVERSION, 0x0000001000000000);

match res.compile()
{
Expand Down
2 changes: 1 addition & 1 deletion Khernet.Installer/installer/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mod logger;
mod dotnet_installer;
mod repository;

const APP_VERSION:&str="0.15.12";
const APP_VERSION:&str="0.16.0";
const APP_DIR:&str="khernet-app";
const INNER_APP_DIR_PREFIX:&str="app-";
const LAUNCHER_FILE:&str="khernetlauncher.exe";
Expand Down
16 changes: 9 additions & 7 deletions Khernet.UI/Khernet.UI.Presentation/Pages/AboutPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@
<Run Text="Version: "/>
<Run Text="{x:Static Cache:Configurations.AppVerion}"/>
<LineBreak/>
<Run Text="Report an issue: "/>
<Hyperlink Command="{Binding OpenIssueCommand}" >
<Run Text="here"/>
</Hyperlink>
<LineBreak/>
<Run Text="Installation path: "/>
<Hyperlink Command="{Binding OpenInstallationPathCommand}" >
<Run Text="click here"/>
Expand All @@ -51,8 +46,15 @@
<Run Text="click here"/>
</Hyperlink>
<LineBreak/>
<Hyperlink Command="{Binding OpenSourceCodeCommand}" >
<Run Text="Source code"/>
<LineBreak/>
<Run Text="Home: "/>
<Hyperlink Command="{Binding OpenHomePageCommand}" >
<Run Text="https://khernet.app"/>
</Hyperlink>
<LineBreak/>
<Run Text="Report an issue: "/>
<Hyperlink Command="{Binding OpenIssueCommand}" >
<Run Text="here"/>
</Hyperlink>
</Paragraph>
</FlowDocument>
Expand Down
4 changes: 2 additions & 2 deletions Khernet.UI/Khernet.UI.Presentation/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
ResourceDictionaryLocation.SourceAssembly
)]

[assembly: AssemblyVersion("0.15.12.0")]
[assembly: AssemblyFileVersion("0.15.12.0")]
[assembly: AssemblyVersion("0.16.0.0")]
[assembly: AssemblyFileVersion("0.16.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ public class AboutViewModel : BaseModel
public ICommand OpenIssueCommand { get; private set; }

/// <summary>
/// Opens the source code page on browser.
/// Opens the home page on browser.
/// </summary>
public ICommand OpenSourceCodeCommand { get; private set; }
public ICommand OpenHomePageCommand { get; private set; }

/// <summary>
/// Opens the directory where this installer (the executable that installs the whole application) is located.
Expand All @@ -39,7 +39,7 @@ public class AboutViewModel : BaseModel
public AboutViewModel()
{
OpenIssueCommand = new RelayCommand(OpenIssue);
OpenSourceCodeCommand = new RelayCommand(OpenSourceCode);
OpenHomePageCommand = new RelayCommand(OpenHomePage);
OpenInstallationPathCommand = new RelayCommand(OpenInstallationPath);
OpenWorkingDirectoryCommand = new RelayCommand(OpenWorkingDirectory);
}
Expand All @@ -49,14 +49,14 @@ private void OpenWorkingDirectory()
Process.Start(Configurations.HomeDirectory);
}

private void OpenSourceCode()
private void OpenHomePage()
{
Process.Start("https://github.com/lemalcs/Khernet");
Process.Start("https://khernet.app");
}

private void OpenIssue()
{
Process.Start("https://github.com/lemalcs/Khernet-issues/issues");
Process.Start("https://github.com/lemalcs/Khernet/issues");
}

private async void OpenInstallationPath()
Expand Down
2 changes: 1 addition & 1 deletion build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ echo Starting build...
echo -------------------------------------------------------------

rem Set this to Release or Debug values
set dotnetConfiguration=Debug
set dotnetConfiguration=Release

rem Build core
tools\nuget restore Khernet.Core\Khernet.Core.sln
Expand Down

0 comments on commit 23ffc25

Please sign in to comment.