Skip to content

Commit 7d62380

Browse files
JusterZhuJusterZhu
committed
Remove UpdateMode and related update options
Delete the UpdateMode enum and remove deprecated update options from UpdateOptions (DriveEnabled, Mode, OSSProvider, OSSBucketRegion, BlackList). Update unit tests to remove assertions and usages referencing those options and adjust bootstrap test parameter matrices accordingly. This cleans up obsolete configuration flags and corresponding test coverage.
1 parent dff3177 commit 7d62380

5 files changed

Lines changed: 0 additions & 62 deletions

File tree

‎src/c#/GeneralUpdate.Core/Configuration/UpdateMode.cs‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/c#/GeneralUpdate.Core/Configuration/UpdateOptions.cs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,12 @@ public static class UpdateOptions
2929
/// <summary>Download timeout in seconds.</summary>
3030
public static UpdateOption<int?> DownloadTimeout { get; } = UpdateOption.ValueOf<int?>("DOWNLOADTIMEOUT", 30);
3131

32-
/// <summary>Whether driver update mode is enabled.</summary>
33-
public static UpdateOption<bool?> DriveEnabled { get; } = UpdateOption.ValueOf<bool?>("DRIVE", false);
34-
3532
/// <summary>Whether differential patch update is enabled.</summary>
3633
public static UpdateOption<bool?> PatchEnabled { get; } = UpdateOption.ValueOf<bool?>("PATCH", true);
3734

3835
/// <summary>Whether backup before update is enabled.</summary>
3936
public static UpdateOption<bool?> BackupEnabled { get; } = UpdateOption.ValueOf<bool?>("BACKUP", true);
4037

41-
/// <summary>Update mode override.</summary>
42-
public static UpdateOption<UpdateMode?> Mode { get; } = UpdateOption.ValueOf<UpdateMode?>("MODE", null);
43-
4438
/// <summary>Whether silent background update is enabled.</summary>
4539
public static UpdateOption<bool> Silent { get; } = UpdateOption.ValueOf<bool>("ENABLESILENTUPDATE", false);
4640

@@ -68,17 +62,6 @@ public static class UpdateOptions
6862
/// <summary>Initial retry interval for exponential back-off. Default 1 second.</summary>
6963
public static UpdateOption<TimeSpan> RetryInterval { get; } = UpdateOption.ValueOf<TimeSpan>("RETRYINTERVAL", TimeSpan.FromSeconds(1));
7064

71-
// ═══ OSS ═══
72-
/// <summary>Object Storage Service provider type.</summary>
73-
public static UpdateOption<OssProvider?> OSSProvider { get; } = UpdateOption.ValueOf<OssProvider?>("OSSPROVIDER", null);
74-
75-
/// <summary>OSS bucket region identifier.</summary>
76-
public static UpdateOption<string?> OSSBucketRegion { get; } = UpdateOption.ValueOf<string?>("OSSBUCKETREGION", null);
77-
78-
// ═══ Blacklist ═══
79-
/// <summary>Blacklist configuration for files and directories to exclude from updates.</summary>
80-
public static UpdateOption<BlackListConfig> BlackList { get; } = UpdateOption.ValueOf<BlackListConfig>("BLACKLIST", BlackListConfig.Empty);
81-
8265
// ═══ SignalR Hub ═══
8366
/// <summary>SignalR Hub configuration for push-based updates.</summary>
8467
public static UpdateOption<HubConfig?> Hub { get; } = UpdateOption.ValueOf<HubConfig?>("HUB", null);

‎tests/CoreTest/Bootstrap/BootstrapFullParameterMatrixTests.cs‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,10 @@ public void Dispose()
5151
[Fact] public void Format_ZIP() => Assert.NotNull(B().Option(UpdateOptions.Format, "ZIP"));
5252
[Theory][InlineData(10)][InlineData(30)][InlineData(60)][InlineData(300)]
5353
public void DownloadTimeout_Various(int t) => Assert.NotNull(B().Option(UpdateOptions.DownloadTimeout, t));
54-
[Fact] public void DriveEnabled_True() => Assert.NotNull(B().Option(UpdateOptions.DriveEnabled, true));
55-
[Fact] public void DriveEnabled_False() => Assert.NotNull(B().Option(UpdateOptions.DriveEnabled, false));
5654
[Fact] public void PatchEnabled_True() => Assert.NotNull(B().Option(UpdateOptions.PatchEnabled, true));
5755
[Fact] public void PatchEnabled_False() => Assert.NotNull(B().Option(UpdateOptions.PatchEnabled, false));
5856
[Fact] public void BackupEnabled_False() => Assert.NotNull(B().Option(UpdateOptions.BackupEnabled, false));
5957
[Fact] public void Silent_True() => Assert.NotNull(B().Option(UpdateOptions.Silent, true));
60-
[Fact] public void Mode_Default() => Assert.NotNull(B().Option(UpdateOptions.Mode, UpdateMode.Default));
61-
[Fact] public void Mode_Scripts() => Assert.NotNull(B().Option(UpdateOptions.Mode, UpdateMode.Scripts));
6258
#endregion
6359

6460
#region Silent
@@ -77,16 +73,7 @@ public void Dispose()
7773
[Fact] public void RetryInterval_Custom() => Assert.NotNull(B().Option(UpdateOptions.RetryInterval, TimeSpan.FromSeconds(3)));
7874
#endregion
7975

80-
#region OSS
81-
[Fact] public void OSS_AliYun() => Assert.NotNull(B().Option(UpdateOptions.OSSProvider, OssProvider.AliYun));
82-
[Fact] public void OSS_AWS() => Assert.NotNull(B().Option(UpdateOptions.OSSProvider, OssProvider.AWS));
83-
[Fact] public void OSSBucketRegion() => Assert.NotNull(B().Option(UpdateOptions.OSSBucketRegion, "cn-shanghai"));
84-
#endregion
85-
8676
#region Blacklist/Misc
87-
[Fact] public void BlackList_Empty() => Assert.NotNull(B().Option(UpdateOptions.BlackList, BlackListConfig.Empty));
88-
[Fact] public void BlackList_Configured() => Assert.NotNull(B().Option(UpdateOptions.BlackList,
89-
new BlackListConfig(new List<string> { "*.pdb" }, new List<string> { ".log" }, new List<string> { "logs" })));
9077
[Fact] public void Hub_Configured() => Assert.NotNull(B().Option(UpdateOptions.Hub,
9178
new HubConfig { Url = "https://signalr.example.com/hub" }));
9279
#endregion
@@ -100,10 +87,8 @@ [Fact] public void Chain_AllFrameworkOptions()
10087
.Option(UpdateOptions.Encoding, Encoding.UTF8)
10188
.Option(UpdateOptions.Format, "ZIP")
10289
.Option(UpdateOptions.DownloadTimeout, 120)
103-
.Option(UpdateOptions.DriveEnabled, false)
10490
.Option(UpdateOptions.PatchEnabled, true)
10591
.Option(UpdateOptions.BackupEnabled, true)
106-
.Option(UpdateOptions.Mode, UpdateMode.Default)
10792
.Option(UpdateOptions.Silent, false)
10893
.Option(UpdateOptions.MaxConcurrency, 4)
10994
.Option(UpdateOptions.EnableResume, true)
@@ -112,7 +97,6 @@ [Fact] public void Chain_AllFrameworkOptions()
11297
.Option(UpdateOptions.RetryInterval, TimeSpan.FromSeconds(2))
11398
.Option(UpdateOptions.SilentAutoInstall, false)
11499
.Option(UpdateOptions.SilentPollIntervalMinutes, 30)
115-
.Option(UpdateOptions.BlackList, BlackListConfig.Empty)
116100
.SetConfig(new Configinfo
117101
{
118102
UpdateUrl = "https://update.example.com/api/v2",
@@ -178,18 +162,14 @@ [Fact] public void Chain_ClientAndUpgrade_BothFullyConfigured()
178162
.Option(UpdateOptions.Encoding, Encoding.UTF8)
179163
.Option(UpdateOptions.Format, "ZIP")
180164
.Option(UpdateOptions.DownloadTimeout, 120)
181-
.Option(UpdateOptions.DriveEnabled, false)
182165
.Option(UpdateOptions.PatchEnabled, true)
183166
.Option(UpdateOptions.BackupEnabled, true)
184-
.Option(UpdateOptions.Mode, UpdateMode.Default)
185167
.Option(UpdateOptions.Silent, false)
186168
.Option(UpdateOptions.MaxConcurrency, 4)
187169
.Option(UpdateOptions.EnableResume, true)
188170
.Option(UpdateOptions.RetryCount, 5)
189171
.Option(UpdateOptions.VerifyChecksum, true)
190172
.Option(UpdateOptions.RetryInterval, TimeSpan.FromSeconds(2))
191-
.Option(UpdateOptions.BlackList, new BlackListConfig(
192-
new List<string> { "*.pdb" }, new List<string> { ".log" }, new List<string> { "logs" }))
193173
.SetConfig(sharedConfig)
194174
.AddListenerUpdatePrecheck(args =>
195175
{
@@ -210,14 +190,11 @@ [Fact] public void Chain_ClientAndUpgrade_BothFullyConfigured()
210190
.Option(UpdateOptions.Encoding, Encoding.UTF8)
211191
.Option(UpdateOptions.Format, "ZIP")
212192
.Option(UpdateOptions.DownloadTimeout, 30)
213-
.Option(UpdateOptions.DriveEnabled, true)
214193
.Option(UpdateOptions.PatchEnabled, true)
215194
.Option(UpdateOptions.BackupEnabled, false)
216-
.Option(UpdateOptions.Mode, UpdateMode.Default)
217195
.Option(UpdateOptions.MaxConcurrency, 2)
218196
.Option(UpdateOptions.VerifyChecksum, true)
219197
.Option(UpdateOptions.RetryInterval, TimeSpan.FromSeconds(1))
220-
.Option(UpdateOptions.BlackList, BlackListConfig.Empty)
221198
.SetConfig(sharedConfig)
222199
.AddListenerException((s, e) => { })
223200
.AddListenerUpdateInfo((s, e) => { });

‎tests/CoreTest/Bootstrap/ParameterMatrixAndEventTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,6 @@ public void UpdateOption_AllConstants_AreAccessible()
298298
Assert.NotNull(UpdateOptions.DownloadTimeout);
299299
Assert.NotNull(UpdateOptions.PatchEnabled);
300300
Assert.NotNull(UpdateOptions.BackupEnabled);
301-
Assert.NotNull(UpdateOptions.DriveEnabled);
302-
Assert.NotNull(UpdateOptions.Mode);
303301
Assert.NotNull(UpdateOptions.Silent);
304302
}
305303

‎tests/CoreTest/Configuration/ConfigurationModelsTests.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -267,14 +267,6 @@ public void DiffMode_SerialAndParallel_AreDefined()
267267
Assert.Contains(DiffMode.Parallel, Enum.GetValues<DiffMode>());
268268
}
269269

270-
[Fact]
271-
public void UpdateMode_HasDefaultAndScripts()
272-
{
273-
var values = Enum.GetValues<UpdateMode>();
274-
Assert.Contains(UpdateMode.Default, values);
275-
Assert.Contains(UpdateMode.Scripts, values);
276-
}
277-
278270
[Fact]
279271
public void PlatformType_AllFour()
280272
{

0 commit comments

Comments
 (0)