upgrade<project>: upgrade to .net 5.0

This commit is contained in:
leo 2020-11-17 11:41:01 +08:00
parent a3f2c672b7
commit 24b175c331
4 changed files with 6 additions and 7 deletions

View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net46</TargetFramework>
<TargetFramework>net5.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>

View file

@ -15,7 +15,8 @@ namespace SourceGit.UI {
/// </summary>
public string Version {
get {
return "VERSION : " + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion;
Assembly asm = Assembly.GetExecutingAssembly();
return "VERSION : " + asm.GetName().Version;
}
}

View file

@ -117,8 +117,7 @@ namespace SourceGit.UI {
new Typeface(content.FontFamily, p.FontStyle, p.FontWeight, p.FontStretch),
content.FontSize,
Brushes.Black,
new NumberSubstitution(),
TextFormattingMode.Ideal);
VisualTreeHelper.GetDpi(this).PixelsPerDip);
if (minWidth < formatter.Width) {
content.Document.PageWidth = formatter.Width + 16;
minWidth = formatter.Width;

View file

@ -212,8 +212,7 @@ namespace SourceGit.UI {
new Typeface(leftText.FontFamily, p.FontStyle, p.FontWeight, p.FontStretch),
leftText.FontSize,
Brushes.Black,
new NumberSubstitution(),
TextFormattingMode.Ideal);
VisualTreeHelper.GetDpi(this).PixelsPerDip);
if (minWidth < formatter.Width) minWidth = formatter.Width;