michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-10-31 13:03:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

upgrade<project>: upgrade to .net 5.0

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/SourceGit.csproj
View file

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

3
src/UI/About.xaml.cs
View file

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

3
src/UI/Blame.xaml.cs
View file

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

3
src/UI/DiffViewer.xaml.cs
View file

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