Skip to content

Commit 4138cea

Browse files
authored
Merge pull request #445 from GeneralLibrary/refactor/merge-extension-injection
refactor: merge duplicate extension injection blocks in LaunchWithStrategy
2 parents 8538a86 + 221688b commit 4138cea

1 file changed

Lines changed: 8 additions & 14 deletions

File tree

src/c#/GeneralUpdate.Core/Bootstrap/GeneralUpdateBootstrap.cs

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -132,23 +132,17 @@ private async Task<GeneralUpdateBootstrap> LaunchWithStrategy(IStrategy roleStra
132132
roleStrategy.Create(_configInfo);
133133

134134
var binaryDiffer = ResolveExtension<IBinaryDiffer>();
135-
if (binaryDiffer != null)
135+
var dirtyStrategy = ResolveExtension<IDirtyStrategy>();
136+
137+
if (roleStrategy is ClientUpdateStrategy cs2)
136138
{
137-
if (roleStrategy is ClientUpdateStrategy cs2)
138-
cs2.SetBinaryDiffer(binaryDiffer);
139-
else if (roleStrategy is UpgradeUpdateStrategy us2)
140-
us2.SetBinaryDiffer(binaryDiffer);
139+
if (binaryDiffer != null) cs2.SetBinaryDiffer(binaryDiffer);
140+
if (dirtyStrategy != null) cs2.SetDirtyStrategy(dirtyStrategy);
141141
}
142-
143-
// Inject binary differ into OS-level strategy for differential patching
144-
// Must be called after Create() since _osStrategy is initialized there.
145-
var dirtyStrategy = ResolveExtension<IDirtyStrategy>();
146-
if (dirtyStrategy != null)
142+
else if (roleStrategy is UpgradeUpdateStrategy us2)
147143
{
148-
if (roleStrategy is ClientUpdateStrategy cs2)
149-
cs2.SetDirtyStrategy(dirtyStrategy);
150-
else if (roleStrategy is UpgradeUpdateStrategy us2)
151-
us2.SetDirtyStrategy(dirtyStrategy);
144+
if (binaryDiffer != null) us2.SetBinaryDiffer(binaryDiffer);
145+
if (dirtyStrategy != null) us2.SetDirtyStrategy(dirtyStrategy);
152146
}
153147

154148
// Check custom skip condition before executing update

0 commit comments

Comments
 (0)