diff --git a/Launcher/Build-Installer.ps1 b/Launcher/Build-Installer.ps1 index 7792401..8da01bd 100644 --- a/Launcher/Build-Installer.ps1 +++ b/Launcher/Build-Installer.ps1 @@ -253,7 +253,7 @@ foreach ($required in @('ToolkitFingerprint','TranslationFingerprint','NativeToo $manifest = [ordered]@{ SchemaVersion = 2 - ProductVersion = '0.2.13' + ProductVersion = '0.2.15' ExpectedGameId = $pins.GameId ExpectedDolSha256 = $pins.DolSha256 ExpectedRelSha256 = $pins.RelSha256 diff --git a/Launcher/WiiCompiled.Setup/InstallerEngine.cs b/Launcher/WiiCompiled.Setup/InstallerEngine.cs index cfdb9d4..3e39b0e 100644 --- a/Launcher/WiiCompiled.Setup/InstallerEngine.cs +++ b/Launcher/WiiCompiled.Setup/InstallerEngine.cs @@ -162,11 +162,7 @@ internal sealed class InstallerEngine publishGameAssets: reusableGameAssets is null, cancellationToken); } - /// - /// Whether this operation must replace the installed Toolkit. The shipped translator and translation - /// project are one unit, so samePackageContent alone isn't enough: sameToolkit tracks the compile - /// identity separately, since gating on package identity alone let the two disagree after the v0.2.5 healing salt bump. - /// + internal static bool MustRefreshToolkit(bool sameToolkit, bool samePackageContent, bool dolphinToolPresent) => !sameToolkit || !samePackageContent || !dolphinToolPresent; diff --git a/Launcher/WiiCompiled.Setup/Models.cs b/Launcher/WiiCompiled.Setup/Models.cs index 0ba2fae..83eb2cc 100644 --- a/Launcher/WiiCompiled.Setup/Models.cs +++ b/Launcher/WiiCompiled.Setup/Models.cs @@ -50,11 +50,6 @@ internal sealed class PayloadManifest public string ToolkitFingerprint { get; set; } = ""; public string ToolkitPackageFingerprint { get; set; } = ""; public string RuntimeAssetsFingerprint { get; set; } = ""; - - /// - /// Cache-reuse subsets of . Empty in a pre-0.2.0 manifest, - /// which every consumer treats as "changed" and therefore as a full rebuild - never as reuse. - /// public string TranslationFingerprint { get; set; } = ""; public string NativeToolchainFingerprint { get; set; } = ""; } @@ -161,7 +156,6 @@ internal sealed class ToolkitState public string ToolkitPackageFingerprint { get; set; } = ""; /// Identity of the runtime assets copied verbatim beside each product. public string RuntimeAssetsFingerprint { get; set; } = ""; - /// Cache-reuse subsets of the compile identity; empty on a pre-0.2.0 installation. public string TranslationFingerprint { get; set; } = ""; public string NativeToolchainFingerprint { get; set; } = ""; public string ToolkitReleaseTag { get; set; } = ""; diff --git a/Launcher/WiiCompiled.Setup/Program.cs b/Launcher/WiiCompiled.Setup/Program.cs index 7863336..52eac2e 100644 --- a/Launcher/WiiCompiled.Setup/Program.cs +++ b/Launcher/WiiCompiled.Setup/Program.cs @@ -121,7 +121,7 @@ internal static class PlatformChecks internal static class ProductInfo { public const string Name = "WiiCompiled"; - public const string Version = "0.2.13"; + public const string Version = "0.2.15"; /// /// The setup executable is copied into the installation under this name. It is the launcher and diff --git a/Launcher/WiiCompiled.Setup/SelfTests.cs b/Launcher/WiiCompiled.Setup/SelfTests.cs index cb54093..6ddead4 100644 --- a/Launcher/WiiCompiled.Setup/SelfTests.cs +++ b/Launcher/WiiCompiled.Setup/SelfTests.cs @@ -133,11 +133,7 @@ internal static class SelfTests } } - /// - /// The translator and the project file it parses must never come from different releases. The - /// first case is the v0.2.5 regression: a compile-identity change republished the workspace - /// while an unchanged package identity retained the older toolkit. - /// + private static void TestToolkitRefreshDecision() { if (!InstallerEngine.MustRefreshToolkit(sameToolkit: false, samePackageContent: true, diff --git a/Launcher/WiiCompiled.Setup/WiiCompiled.Setup.csproj b/Launcher/WiiCompiled.Setup/WiiCompiled.Setup.csproj index 9ea644e..94ce524 100644 --- a/Launcher/WiiCompiled.Setup/WiiCompiled.Setup.csproj +++ b/Launcher/WiiCompiled.Setup/WiiCompiled.Setup.csproj @@ -7,7 +7,7 @@ WiiCompiled.Setup WiiCompiled.Setup app.manifest - 0.2.13 + 0.2.15 patchzy WiiCompiled Command-line installer and launcher for WiiCompiled