Merge pull request #177 from unoplatform/fix-xcode-check

fix: Fix Xcode version checks and manifests
unoplatform · Oct 9, 2023 · 873057f · 873057f
2 parents 154f3fa + accf715
commit 873057f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/UnoCheck/Checkups/XCodeCheckup.cs b/UnoCheck/Checkups/XCodeCheckup.cs
@@ -28,6 +28,9 @@ public NuGetVersion ExactVersion
 		public string ExactVersionName
 			=> Manifest?.Check?.XCode?.ExactVersionName;
 
+		public NuGetVersion Version
+			=> ExactVersion ?? MinimumVersion;
+
 		public string VersionName
 			=> ExactVersionName ?? MinimumVersionName ?? ExactVersion?.ToString() ?? MinimumVersion?.ToString();
 
@@ -67,7 +70,7 @@ public override Task<DiagnosticResult> Examine(SharedState history)
 					}
 
 					// Selected version is good
-					ReportStatus($"Xcode.app ({VersionName})", Status.Ok);
+					ReportStatus($"Xcode.app ({selected.VersionString} {selected.BuildVersion})", Status.Ok);
 					return Task.FromResult(DiagnosticResult.Ok(this));
 				}
 
@@ -101,12 +104,12 @@ public override Task<DiagnosticResult> Examine(SharedState history)
 				}
 
 
-				ReportStatus($"Xcode.app ({VersionName}) not installed.", Status.Error);
+				ReportStatus($"Xcode.app ({Version} {VersionName}) not installed.", Status.Error);
 
 				return Task.FromResult(new DiagnosticResult(
 					Status.Error,
 					this,
-					new Suggestion($"Download XCode {VersionName}")));
+					new Suggestion($"Download XCode {Version} {VersionName}")));
 			}
 			catch(InvalidDataException)
 			{
@@ -177,11 +180,10 @@ XCodeInfo GetXcodeInfo(string path, bool selected)
 			if (File.Exists(versionPlist))
 			{
 				NSDictionary rootDict = (NSDictionary)PropertyListParser.Parse(versionPlist);
-				string cfBundleVersion = rootDict.ObjectForKey("CFBundleVersion")?.ToString();
 				string cfBundleShortVersion = rootDict.ObjectForKey("CFBundleShortVersionString")?.ToString();
 				string productBuildVersion = rootDict.ObjectForKey("ProductBuildVersion")?.ToString();
 
-				if (NuGetVersion.TryParse(cfBundleVersion, out var v))
+				if (NuGetVersion.TryParse(cfBundleShortVersion, out var v))
 					return new XCodeInfo(v, cfBundleShortVersion, productBuildVersion, path, selected);
 			}
 			else

diff --git a/manifests/uno.ui-preview-major.manifest.json b/manifests/uno.ui-preview-major.manifest.json
@@ -22,8 +22,8 @@
       }
     },
     "xcode": {
-      "exactVersion": "14E300c",
-      "exactVersionName": "14.3.1"
+      "exactVersion": "15.0",
+      "exactVersionName": "15A240d"
     },
     "vswin": {
       "minimumVersion": "17.8.0-pre.1"

diff --git a/manifests/uno.ui-preview.manifest.json b/manifests/uno.ui-preview.manifest.json
@@ -22,8 +22,8 @@
       }
     },
     "xcode": {
-      "exactVersion": "14E300c",
-      "exactVersionName": "14.3.1"
+      "exactVersion": "14.3.1",
+      "exactVersionName": "14E300c"
     },
     "vswin": {
       "minimumVersion": "17.4.4"

diff --git a/manifests/uno.ui.manifest.json b/manifests/uno.ui.manifest.json
@@ -22,8 +22,8 @@
       }
     },
     "xcode": {
-      "exactVersion": "14E300c",
-      "exactVersionName": "14.3.1"
+      "exactVersion": "14.3.1",
+      "exactVersionName": "14E300c"
     },
     "vswin": {
       "minimumVersion": "17.4.4"