dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-31 17:14:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

update<project>: downgrade .NET to 4.6; using Newtonsoft.JSON instead of System.Text.Json; using ILRepack to publish single executable file

Browse source
This commit is contained in:
leo 2020-12-31 16:34:52 +08:00
parent dc17bb4b12
commit 0af951bb9a
11 changed files with 30 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,8 +93,7 @@ namespace SourceGit.UI {
FlowDirection.LeftToRight,
new Typeface(blame.FontFamily, FontStyles.Normal, FontWeights.Normal, FontStretches.Normal),
12.0,
Brushes.Black,
VisualTreeHelper.GetDpi(this).PixelsPerDip);
Brushes.Black);
var lineNumberWidth = formatted.Width + 16;
var minWidth = area.ActualWidth - lineNumberWidth;

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

@ -437,8 +437,7 @@ namespace SourceGit.UI {
FlowDirection.LeftToRight,
new Typeface(new FontFamily("Consolas"), FontStyles.Normal, FontWeights.Normal, FontStretches.Normal),
12.0,
Brushes.Black,
VisualTreeHelper.GetDpi(this).PixelsPerDip);
Brushes.Black);
var grid = new DataGrid();
grid.SetValue(Grid.RowProperty, 1);

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

@ -492,8 +492,7 @@ namespace SourceGit.UI {
FlowDirection.LeftToRight,
new Typeface(FontFamily, FontStyles.Normal, FontWeights.Normal, FontStretches.Normal),
12.0,
Brushes.Black,
VisualTreeHelper.GetDpi(this).PixelsPerDip);
Brushes.Black);
return formatted.Width + 16;
}

4
src/UI/Launcher.xaml.cs
View file

@ -1,8 +1,8 @@
using Newtonsoft.Json;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Net;
using System.Reflection;
using System.Text.Json;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows;
@ -138,7 +138,7 @@ namespace SourceGit.UI {
try {
var web = new WebClient();
var raw = web.DownloadString("https://gitee.com/api/v5/repos/sourcegit/SourceGit/releases/latest");
var ver = JsonSerializer.Deserialize<Git.Version>(raw);
var ver = JsonConvert.DeserializeObject<Git.Version>(raw);
var cur = Assembly.GetExecutingAssembly().GetName().Version;
var matches = Regex.Match(ver.TagName, @"^v(\d+)\.(\d+).*");

4
src/UI/Manager.xaml.cs
View file

@ -238,13 +238,13 @@ namespace SourceGit.UI {
mark.Header = $"{i}";
var refIdx = i;
mark.Click += (o, e) => {
mark.Click += (o, ev) => {
var repo = App.Setting.FindRepository(node.Id);
if (repo != null) {
repo.Color = refIdx;
UpdateTree();
}
e.Handled = true;
ev.Handled = true;
};
bookmark.Items.Add(mark);