From 6703037527a04029e82e2257dbd6ea050c696ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E5=82=91?= Date: Thu, 25 Aug 2022 11:38:25 +0800 Subject: [PATCH] Upgrade to PackageReference --- Source/GrasscutterTools/Controls/TextBoxXP.cs | 1 - .../Forms/FormGachaBannerEditor.cs | 1 - .../Forms/FormGachaBannerEditor2.cs | 1 - Source/GrasscutterTools/Forms/FormMain.cs | 1 + .../Forms/FormTextMapBrowser.cs | 1 - .../Game/Gacha/GachaBanner2.cs | 2 - Source/GrasscutterTools/Github/ReleaseAPI.cs | 37 +++- .../GrasscutterTools/GrasscutterTools.csproj | 185 ++---------------- Source/GrasscutterTools/packages.config | 53 ----- 9 files changed, 45 insertions(+), 237 deletions(-) delete mode 100644 Source/GrasscutterTools/packages.config diff --git a/Source/GrasscutterTools/Controls/TextBoxXP.cs b/Source/GrasscutterTools/Controls/TextBoxXP.cs index 977d07b..0f72617 100644 --- a/Source/GrasscutterTools/Controls/TextBoxXP.cs +++ b/Source/GrasscutterTools/Controls/TextBoxXP.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel; -using System.Drawing; using System.Runtime.InteropServices; using System.Windows.Forms; diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs index 7863277..fca8c68 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor.cs @@ -18,7 +18,6 @@ **/ using System; using System.Collections.Generic; -using System.Data; using System.Linq; using System.Text; using System.Windows.Forms; diff --git a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs index e51898f..d90d5df 100644 --- a/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs +++ b/Source/GrasscutterTools/Forms/FormGachaBannerEditor2.cs @@ -19,7 +19,6 @@ using System; using System.Collections.Generic; -using System.Data; using System.Drawing; using System.Linq; using System.Windows.Forms; diff --git a/Source/GrasscutterTools/Forms/FormMain.cs b/Source/GrasscutterTools/Forms/FormMain.cs index 069bd77..42cc3d2 100644 --- a/Source/GrasscutterTools/Forms/FormMain.cs +++ b/Source/GrasscutterTools/Forms/FormMain.cs @@ -32,6 +32,7 @@ using GrasscutterTools.GOOD; using GrasscutterTools.OpenCommand; using GrasscutterTools.Properties; using GrasscutterTools.Utils; + using Newtonsoft.Json; namespace GrasscutterTools.Forms diff --git a/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs b/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs index 965449e..45ea14f 100644 --- a/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs +++ b/Source/GrasscutterTools/Forms/FormTextMapBrowser.cs @@ -18,7 +18,6 @@ **/ using System; using System.Collections.Generic; -using System.Data; using System.Linq; using System.Text.RegularExpressions; using System.Windows.Forms; diff --git a/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs b/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs index ea71bad..a8288af 100644 --- a/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs +++ b/Source/GrasscutterTools/Game/Gacha/GachaBanner2.cs @@ -16,8 +16,6 @@ * along with this program. If not, see . * **/ -using System.ComponentModel; - using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/Source/GrasscutterTools/Github/ReleaseAPI.cs b/Source/GrasscutterTools/Github/ReleaseAPI.cs index c796d7b..ecbbe33 100644 --- a/Source/GrasscutterTools/Github/ReleaseAPI.cs +++ b/Source/GrasscutterTools/Github/ReleaseAPI.cs @@ -1,9 +1,29 @@ -using System; +/** + * Grasscutter Tools + * Copyright (C) 2022 jie65535 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + **/ +using System; using System.Net.Http.Headers; using System.Threading.Tasks; using GrasscutterTools.Utils; +using Newtonsoft.Json; + namespace GrasscutterTools.Github { public static class ReleaseAPI @@ -14,15 +34,7 @@ namespace GrasscutterTools.Github try { HttpHelper.HttpClient.DefaultRequestHeaders.UserAgent.Add(headerValue); - var r = await HttpHelper.GetAsync($"https://api.github.com/repos/{username}/{repo}/releases/latest"); - return new ReleaseInfo - { - TagName = r.tag_name, - Url = r.html_url, - CraeteTime = r.created_at, - Name = r.name, - Body = r.body - }; + return await HttpHelper.GetAsync($"https://api.github.com/repos/{username}/{repo}/releases/latest"); } finally { @@ -32,14 +44,19 @@ namespace GrasscutterTools.Github public class ReleaseInfo { + [JsonProperty("tag_name")] public string TagName { get; set; } + [JsonProperty("html_url")] public string Url { get; set; } + [JsonProperty("created_at")] public DateTimeOffset CraeteTime { get; set; } + [JsonProperty("name")] public string Name { get; set; } + [JsonProperty("body")] public string Body { get; set; } } } diff --git a/Source/GrasscutterTools/GrasscutterTools.csproj b/Source/GrasscutterTools/GrasscutterTools.csproj index 93a58e4..3f61c01 100644 --- a/Source/GrasscutterTools/GrasscutterTools.csproj +++ b/Source/GrasscutterTools/GrasscutterTools.csproj @@ -1,7 +1,5 @@  - - Debug @@ -44,156 +42,10 @@ Properties\app.manifest - - ..\packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll - - - - - ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - True - True - - - ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll - True - True - - - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll - True - True - - - - ..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll - True - True - - - ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll - True - True - - - ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll - True - True - - - ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - True - True - - - - ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll - True - True - - - ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - True - True - - - ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - True - True - - - ..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll - True - True - - - ..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll - True - True - - - ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll - True - True - - - ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll - True - True - - - - ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll - True - True - - - ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - True - True - - - ..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll - True - True - - - ..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll - True - True - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True - - - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - True - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - True - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - True - - - ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll - True - True - - - - - - - + - - - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - True - True - @@ -335,7 +187,6 @@ Resources.resx True - SettingsSingleFileGenerator @@ -425,24 +276,22 @@ Microsoft .NET Framework 4.8 %28x86 和 x64%29 true - - False - .NET Framework 3.5 SP1 - false - + + + + 5.7.0 + all + + + 6.6.3 + all + + + 13.0.1 + + + 2.2.0 + - - - 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - - - - - - - - \ No newline at end of file diff --git a/Source/GrasscutterTools/packages.config b/Source/GrasscutterTools/packages.config deleted file mode 100644 index 732969a..0000000 --- a/Source/GrasscutterTools/packages.config +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file