feature<Project>: supports build with .NET 6

This commit is contained in:
leo 2021-10-28 15:47:47 +08:00
parent 898599afc9
commit 3628729a93
5 changed files with 74 additions and 7 deletions

View file

@ -1,10 +1,15 @@
using System;
using System.Net;
using System.Reflection;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
#if NET6_0_OR_GREATER
using System.Net.Http;
#else
using System.Net;
using System.Text;
#endif
namespace SourceGit.Models {
/// <summary>
/// 崩溃日志上报
@ -40,6 +45,13 @@ namespace SourceGit.Models {
e.Source,
e.StackTrace);
#if NET6_0_OR_GREATER
var req = new HttpClient();
req.DefaultRequestHeaders.Add("Content-Type", "application/json");
req.DefaultRequestHeaders.Add("charset", "UTF-8");
req.Timeout = TimeSpan.FromSeconds(1);
req.PostAsync("https://gitee.com/api/v5/repos/sourcegit/issues", new StringContent(JsonSerializer.Serialize(issue))).Wait();
#else
var req = WebRequest.CreateHttp("https://gitee.com/api/v5/repos/sourcegit/issues");
req.Method = "POST";
req.ContentType = "application/json";
@ -53,6 +65,7 @@ namespace SourceGit.Models {
}
req.GetResponse();
#endif
} catch { }
}
}

View file

@ -1,12 +1,17 @@
using System;
using System.Net;
using System.Reflection;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
#if NET6_0_OR_GREATER
using System.Net.Http;
#else
using System.Net;
using System.Text;
#endif
namespace SourceGit.Models {
/// <summary>
@ -43,10 +48,18 @@ namespace SourceGit.Models {
var lastDayOfYear = Preference.Instance.General.LastCheckDay;
if (lastDayOfYear != curDayOfYear) {
Preference.Instance.General.LastCheckDay = curDayOfYear;
Task.Run(() => {
Task.Run(async () => {
try {
#if NET6_0_OR_GREATER
var req = new HttpClient();
var rsp = await req.GetAsync("https://gitee.com/api/v5/repos/sourcegit/sourcegit/releases/latest");
rsp.EnsureSuccessStatusCode();
var raw = await rsp.Content.ReadAsStringAsync();
#else
var web = new WebClient() { Encoding = Encoding.UTF8 };
var raw = web.DownloadString("https://gitee.com/api/v5/repos/sourcegit/sourcegit/releases/latest");
var raw = await web.DownloadStringTaskAsync("https://gitee.com/api/v5/repos/sourcegit/sourcegit/releases/latest");
#endif
var ver = JsonSerializer.Deserialize<Version>(raw);
var cur = Assembly.GetExecutingAssembly().GetName().Version;