Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit
Swift apple-silicond3dmetaldxmtdxvkgame-porting-toolkitgptkmac-gamingmacosmetalfxrosetta-2steamsteam-playwinewinecx
Show CrossOver versions as 2026 10 06-ARM64 - Rosetta
NotProtonNot546eae08a591
diff --git a/app/Sources/NotProtonApp/App.swift b/app/Sources/NotProtonApp/App.swiftindex 04eb401..8b3bd59 100644--- a/app/Sources/NotProtonApp/App.swift+++ b/app/Sources/NotProtonApp/App.swift@@ -126,7 +126,7 @@ struct NotProtonApp: App {if prefixes.tools.count > 1 {Menu(PrefixPrompt.rebuildButton(selectionTargets)) {ForEach(prefixes.tools) { tool in- Button(tool.shortDisplay) {+ Button(tool.display) {prefixes.pendingConfirmation = .rebuild(selectionTargets, tool)}}diff --git a/app/Sources/NotProtonApp/Model/PrefixPrompt.swift b/app/Sources/NotProtonApp/Model/PrefixPrompt.swiftindex 349f7ec..88ba45b 100644--- a/app/Sources/NotProtonApp/Model/PrefixPrompt.swift+++ b/app/Sources/NotProtonApp/Model/PrefixPrompt.swift@@ -33,7 +33,7 @@ enum PrefixPrompt {}static func rebuildTitle(_ targets: [WinePrefix], for tool: InstalledTool? = nil) -> String {- let with = tool.map { " with \($0.shortDisplay)" } ?? ""+ let with = tool.map { " with \($0.display)" } ?? ""switch targets.count {case 0: return "Rebuild prefix\(with)?"case 1: return "Rebuild the prefix for \(targets[0].title)\(with)?"diff --git a/app/Sources/NotProtonApp/Model/SupportedRunner.swift b/app/Sources/NotProtonApp/Model/SupportedRunner.swiftindex 3b26042..8303559 100644--- a/app/Sources/NotProtonApp/Model/SupportedRunner.swift+++ b/app/Sources/NotProtonApp/Model/SupportedRunner.swift@@ -49,10 +49,8 @@ struct CompatTool: Sendable, Hashable, Identifiable {let name: Stringlet flavor: Flavorlet display: String- var short: String? = nilvar id: String { name }- var shortDisplay: String { short ?? display }var prefixArch: PrefixArch { flavor == .fex ? .arm64 : .x86_64 }}@@ -64,7 +62,6 @@ struct InstalledTool: Sendable, Hashable, Identifiable {var id: String { tool.name }var name: String { tool.name }var display: String { tool.display }- var shortDisplay: String { tool.shortDisplay }}enum SupportedRunners {@@ -95,7 +92,7 @@ enum SupportedRunners {build.tools.enumerated().map { index, tool inlet name = build.id == holder && index == 0 ? legacyToolName : tool.namereturn InstalledTool(- tool: CompatTool(name: name, flavor: tool.flavor, display: tool.display, short: tool.short), build: build.id+ tool: CompatTool(name: name, flavor: tool.flavor, display: tool.display), build: build.id)}}@@ -139,7 +136,7 @@ enum SupportedRunners {.i386Windows: "25bfde1f50ee96485763968ef10b9d9ad35e38214232f17ebdc009b098af44a0",],tools: [- CompatTool(name: "notproton-preview", flavor: .rosetta, display: "CrossOver 20260821 (X86) - Rosetta", short: "20260821 (X86) - Rosetta"),+ CompatTool(name: "notproton-preview", flavor: .rosetta, display: "CrossOver 2026 08 21-X86 - Rosetta"),]),RunnerBuild(@@ -158,8 +155,8 @@ enum SupportedRunners {.aarch64Windows: "f40810193a5ef2520774288f354a8604f5ba91828315f643b3ee6688b873dc3f",],tools: [- CompatTool(name: "notproton-fex", flavor: .fex, display: "CrossOver 20260821 (ARM64) - FEX", short: "20260821 (ARM64) - FEX"),- CompatTool(name: "notproton-fex-rosetta", flavor: .rosetta, display: "CrossOver 20260821 (ARM64) - Rosetta", short: "20260821 (ARM64) - Rosetta"),+ CompatTool(name: "notproton-fex", flavor: .fex, display: "CrossOver 2026 08 21-ARM64 - FEX"),+ CompatTool(name: "notproton-fex-rosetta", flavor: .rosetta, display: "CrossOver 2026 08 21-ARM64 - Rosetta"),]),RunnerBuild(@@ -176,7 +173,7 @@ enum SupportedRunners {.i386Windows: "0d8e3ebb57b3173f675eef5e3a0950052c592efa10a7a10193b0beb811b55ea5",],tools: [- CompatTool(name: "notproton-preview-41069", flavor: .rosetta, display: "CrossOver 20261006 (X86) - Rosetta", short: "20261006 (X86) - Rosetta"),+ CompatTool(name: "notproton-preview-41069", flavor: .rosetta, display: "CrossOver 2026 10 06-X86 - Rosetta"),]),RunnerBuild(@@ -195,8 +192,8 @@ enum SupportedRunners {.aarch64Windows: "7623c0b33350f511b431d39c7ec0c0d4f5def4183acef0eee5d4a5c694898956",],tools: [- CompatTool(name: "notproton-fex-41069", flavor: .fex, display: "CrossOver 20261006 (ARM64) - FEX", short: "20261006 (ARM64) - FEX"),- CompatTool(name: "notproton-fex-rosetta-41069", flavor: .rosetta, display: "CrossOver 20261006 (ARM64) - Rosetta", short: "20261006 (ARM64) - Rosetta"),+ CompatTool(name: "notproton-fex-41069", flavor: .fex, display: "CrossOver 2026 10 06-ARM64 - FEX"),+ CompatTool(name: "notproton-fex-rosetta-41069", flavor: .rosetta, display: "CrossOver 2026 10 06-ARM64 - Rosetta"),]),]diff --git a/app/Sources/NotProtonApp/PrefixesModel.swift b/app/Sources/NotProtonApp/PrefixesModel.swiftindex 636bc3f..aac5ed1 100644--- a/app/Sources/NotProtonApp/PrefixesModel.swift+++ b/app/Sources/NotProtonApp/PrefixesModel.swift@@ -25,7 +25,7 @@ final class PrefixesModel {private(set) var currentTools: [String: InstalledTool] = [:]func lastTool(_ prefix: WinePrefix) -> String? {- if let tool = currentTools[prefix.id] { return tool.shortDisplay }+ if let tool = currentTools[prefix.id] { return tool.display }guard let record = records[prefix.id] else { return nil }return record.display ?? SupportedRunners.displayVersion(forID: record.build)}diff --git a/app/Sources/NotProtonApp/Views/PrefixesView.swift b/app/Sources/NotProtonApp/Views/PrefixesView.swiftindex 3eda79d..45d6b0e 100644--- a/app/Sources/NotProtonApp/Views/PrefixesView.swift+++ b/app/Sources/NotProtonApp/Views/PrefixesView.swift@@ -343,7 +343,7 @@ struct PrefixesView: View {@ViewBuilderprivate func rebuildChoices(_ targets: [WinePrefix], label: String? = nil) -> some View {ForEach(model.tools) { tool in- Button(label ?? tool.shortDisplay) {+ Button(label ?? tool.display) {model.pendingConfirmation = .rebuild(targets, tool)}}diff --git a/app/Tests/NotProtonAppTests/PrefixesModelTests.swift b/app/Tests/NotProtonAppTests/PrefixesModelTests.swiftindex 600d696..86185a5 100644--- a/app/Tests/NotProtonAppTests/PrefixesModelTests.swift+++ b/app/Tests/NotProtonAppTests/PrefixesModelTests.swift@@ -156,8 +156,8 @@ struct PrefixesModelTests {func shown(_ appID: String) throws -> String? {model.lastTool(try #require(model.prefixes.first { $0.appID == appID }))}- #expect(try shown("1574480") == "20260821 (ARM64) - FEX")- #expect(try shown("253750") == "20260821 (ARM64) - Rosetta")+ #expect(try shown("1574480") == "CrossOver 2026 08 21-ARM64 - FEX")+ #expect(try shown("253750") == "CrossOver 2026 08 21-ARM64 - Rosetta")}@Test("A load lists the prefixes and measures each one")