Skip to content

Commit

Permalink
Add ZFeatureHarmony and fix installation exception
Browse files Browse the repository at this point in the history
 - Added ZFeatureHarmony as a selectable channel
 - Fixed a bug where updating Roblox would cause an exception when upgrading Bloxstrap versions (#12)
  • Loading branch information
pizzaboxer committed Sep 2, 2022
1 parent 427485f commit c71c2b1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Bloxstrap/Bloxstrap.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<Platforms>AnyCPU;x86</Platforms>
<ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
<Version>1.4.1</Version>
<FileVersion>1.4.1.0</FileVersion>
<Version>1.4.2</Version>
<FileVersion>1.4.2.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 4 additions & 2 deletions Bloxstrap/Bootstrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -435,10 +435,12 @@ private async Task InstallLatestVersion()
File.Delete(filename);
}

if (VersionGuid != Program.Settings.VersionGuid)
string oldVersionFolder = Path.Combine(Directories.Versions, Program.Settings.VersionGuid);

if (VersionGuid != Program.Settings.VersionGuid && Directory.Exists(oldVersionFolder))
{
// and also to delete our old version folder
Directory.Delete(Path.Combine(Directories.Versions, Program.Settings.VersionGuid), true);
Directory.Delete(oldVersionFolder, true);
}
}

Expand Down
2 changes: 2 additions & 0 deletions Bloxstrap/Helpers/DeployManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class DeployManager
"LIVE",
"ZAvatarTeam",
"ZCanary",
"ZFeatureHarmony",
"ZIntegration",
"ZLive",
"ZNext",
Expand All @@ -43,6 +44,7 @@ public class DeployManager
"ZFeatureBoost_Removal_Test_In_Prod",
"ZFeatureFMOD-20115",
"ZFeatureFMOD-Recording-Test",
"ZFeatureHarmony",
"ZFeatureHSR2CDNPlayTest",
"ZFeatureHSR2CDNPlayTest2",
"ZFeatureInstance-Parent-Weak-Ptr",
Expand Down

0 comments on commit c71c2b1

Please sign in to comment.