From 88bebffde9981742577ee164ab07ddd74cc8d442 Mon Sep 17 00:00:00 2001 From: "Juster.zhu" Date: Thu, 6 Oct 2022 18:40:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/c#/GeneralUpdate.PacketTool/ViewModels/MainViewModel.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/c#/GeneralUpdate.PacketTool/ViewModels/MainViewModel.cs b/src/c#/GeneralUpdate.PacketTool/ViewModels/MainViewModel.cs index 5941ed2..1c8848b 100644 --- a/src/c#/GeneralUpdate.PacketTool/ViewModels/MainViewModel.cs +++ b/src/c#/GeneralUpdate.PacketTool/ViewModels/MainViewModel.cs @@ -81,7 +81,7 @@ namespace GeneralUpdate.PacketTool.ViewModels { _formats = new List(); _formats.Add(".zip"); - _formats.Add(".7z"); + //_formats.Add(".7z"); } return _formats; } @@ -179,7 +179,7 @@ namespace GeneralUpdate.PacketTool.ViewModels await DifferentialCore.Instance.Clean(SourcePath, TargetPath, PatchPath, (sender, args) =>{}, String2OperationType(CurrentFormat),String2Encoding(CurrentEncoding), PacketName); - await DifferentialCore.Instance.Drity(SourcePath,PatchPath); + //await DifferentialCore.Instance.Drity(SourcePath,PatchPath); if (IsPublish) { var packetPath = Path.Combine(TargetPath,$"{PacketName}{CurrentFormat}"); -- Gitee From 916f606cd4457b745c6c05860041217eeaf92e6c Mon Sep 17 00:00:00 2001 From: "Juster.zhu" Date: Thu, 6 Oct 2022 18:56:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=E8=B7=B3=E8=BF=87Newtonsoft.Js?= =?UTF-8?q?on.dll=E6=A3=80=E6=B5=8B=E3=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generalupdate.metadata.v5 | Bin 784032 -> 784045 bytes .../generalupdate.projects.v5 | Bin 3282367 -> 4280633 bytes .../Common/Filefilter.cs | 4 +++- .../ContentProvider/FileProvider.cs | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/c#/.vs/ProjectEvaluation/generalupdate.metadata.v5 b/src/c#/.vs/ProjectEvaluation/generalupdate.metadata.v5 index 6c66db0f4f1b5a073f6c40a1635219a4b0423128..8ea0b844c8115e68ac194283c4e8abea766492e2 100644 GIT binary patch delta 1976 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 diff --git a/src/c#/.vs/ProjectEvaluation/generalupdate.projects.v5 b/src/c#/.vs/ProjectEvaluation/generalupdate.projects.v5 index 638fad94fa68e2f8d3b9b02f7a3afa62bdb6952f..fe4868496333cd405f0a721e70747f682518c176 100644 GIT binary patch delta 8651 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 N&wGuQ=aZYC{eSTJpx^)i delta 111 zcmV~$H4?%A006LSao6Hf-1UVF;Ulc9EKFT_7RmSZ43qaScnE}2(lWAg@(PMd$||aA p>Kd9_+9DlYJ$(a1BV!X&v6;DrrIodft)0Dtqm#3XtJ~+EM1S`cBwYXi diff --git a/src/c#/GeneralUpdate.Differential/Common/Filefilter.cs b/src/c#/GeneralUpdate.Differential/Common/Filefilter.cs index f06fd8e..1b78d12 100644 --- a/src/c#/GeneralUpdate.Differential/Common/Filefilter.cs +++ b/src/c#/GeneralUpdate.Differential/Common/Filefilter.cs @@ -4,11 +4,13 @@ namespace GeneralUpdate.Differential.Common { public class Filefilter { + public const string JSON_DLL = "Newtonsoft.Json.dll"; + public static readonly List Temp = new List() { ".json" }; /// /// File formats to avoid when doing differential updates. /// - public static readonly List Diff = new List() { ".patch", ".7z", ".zip", ".rar", ".tar", ".db", ".xml", ".ini", ".json", ".config", ".gdep" }; + public static readonly List Diff = new List() { ".patch", ".7z", ".zip", ".rar", ".tar", ".db", ".xml", ".ini", ".json", ".config" }; } } \ No newline at end of file diff --git a/src/c#/GeneralUpdate.Differential/ContentProvider/FileProvider.cs b/src/c#/GeneralUpdate.Differential/ContentProvider/FileProvider.cs index 555750c..69ccaf1 100644 --- a/src/c#/GeneralUpdate.Differential/ContentProvider/FileProvider.cs +++ b/src/c#/GeneralUpdate.Differential/ContentProvider/FileProvider.cs @@ -1,4 +1,5 @@ using GeneralUpdate.Core.Utils; +using GeneralUpdate.Differential.Common; using System; using System.Collections.Generic; using System.IO; @@ -52,6 +53,7 @@ namespace GeneralUpdate.Differential.ContentProvider var resultFiles = new List(); foreach (var subPath in Directory.GetFiles(path)) { + if (subPath.Contains(Filefilter.JSON_DLL)) continue; var md5 = FileUtil.GetFileMD5(subPath); var subFileInfo = new FileInfo(subPath); resultFiles.Add(new FileNode() { Id = GetId(), Path = path, Name = subFileInfo.Name, MD5 = md5, FullName = subFileInfo.FullName }); -- Gitee From dece9d9cf4c27ab8fafb5babebf3422d90e7d82a Mon Sep 17 00:00:00 2001 From: "Juster.zhu" Date: Thu, 6 Oct 2022 23:13:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +-- README_en.md | 4 ++-- src/c#/GeneralUpdate.Client/MainPage.xaml | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a2d6eec..e021087 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # GeneralUpdate # ![](https://img.shields.io/github/license/WELL-E/AutoUpdater?color=blue) -![](https://img.shields.io/github/stars/WELL-E/AutoUpdater?color=blue) ![](imgs/GeneralUpdate_h.png) @@ -9,7 +8,7 @@ ### 组件介绍 ### -GeneralUpdate寓意为通用更新力致于成为全平台更新组件，包含常见个人、企业项目所需特性。并提供GeneralUpdate.PacketTool更新包打包工具。 +GeneralUpdate寓意为通用更新力致于成为全平台更新组件。 | 功能 | 是否支持 | 备注 | | ------------------------------ | -------- | ------------------------------------------------------------ | diff --git a/README_en.md b/README_en.md index 8500e80..8bbdaa0 100644 --- a/README_en.md +++ b/README_en.md @@ -1,12 +1,12 @@ # GeneralUpdate # ![](https://img.shields.io/github/license/WELL-E/AutoUpdater?color=blue) -![](https://img.shields.io/github/stars/WELL-E/AutoUpdater?color=blue) + ![](imgs/GeneralUpdate_h.png) ### Component introduction ### -GeneralUpdate means that the general update is committed to becoming a full-platform update component, including features required for common personal and enterprise projects. And provide GeneralUpdate.PacketTool update package packaging tool. +GeneralUpdate means that the general update is committed to becoming a full-platform update component, including features required for common personal and enterprise projects. | Function | support | Remark | | ------------------------------------------------- | -------------------- | ------------------------------------------------------------ | diff --git a/src/c#/GeneralUpdate.Client/MainPage.xaml b/src/c#/GeneralUpdate.Client/MainPage.xaml index 2e96963..cf0f362 100644 --- a/src/c#/GeneralUpdate.Client/MainPage.xaml +++ b/src/c#/GeneralUpdate.Client/MainPage.xaml @@ -21,10 +21,6 @@ x:Name="MyButton" Text="launch" HorizontalOptions="Center" /> -