Merge pull request #337 from unoplatform/restore-uno.sdk-required-by-…

…solution feat: Add parameter to allow passing Uno.SDK version required by solution
unoplatform · Feb 7, 2025 · 3e6e39b · 3e6e39b
2 parents 7156497 + 02b29df
commit 3e6e39b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -111,6 +111,9 @@ jobs:
          - manifest: 'manifests\uno.ui.manifest.json'
            manifest_name: Test net8.0-browserwasm TFM
            tool_params: '--tfm net8.0-browserwasm'
+         - manifest: 'manifests\uno.ui.manifest.json'
+           manifest_name: Test unoSdkVersion
+           tool_params: '--unoSdkVersion 5.6.19'
          - manifest: 'manifests\uno.ui-preview-major.manifest.json'
            manifest_name: Test default Uno template TFM's with net9
            tool_params: '--tfm net9.0-android --tfm net9.0-ios --tfm net9.0-maccatalyst --tfm net9.0-windows10.0.19041 --tfm net9.0-browserwasm --tfm net9.0-desktop'

diff --git a/UnoCheck/CheckCommand.cs b/UnoCheck/CheckCommand.cs
@@ -104,6 +104,8 @@ public override async Task<int> ExecuteAsync(CommandContext context, CheckSettin
 				sharedState.SetEnvironmentVariable("DOTNET_FORCE", "true");
 			if (settings.CI)
 				sharedState.SetEnvironmentVariable("CI", "true");
+			if (!string.IsNullOrEmpty(settings.UnoSdkVersion))
+				sharedState.SetEnvironmentVariable("UnoSdkVersion", settings.UnoSdkVersion);
             if (settings.Frameworks is { Length: > 0 })
                 settings.TargetPlatforms = ParseTfmsToTargetPlatforms(settings);
             if (!string.IsNullOrEmpty(settings.Ide))

diff --git a/UnoCheck/CheckSettings.Uno.cs b/UnoCheck/CheckSettings.Uno.cs
@@ -26,5 +26,10 @@ partial class CheckSettings
         [Description(
             @"This parameter skips some checks based on the IDE which is used to run the Uno.Check.")]
         public string? Ide { get; set; }
+
+        [CommandOption("--unoSdkVersion <UNO_SDK_VERSION>")]
+        [Description(
+	        @"Uno SDK Checkup will validate if provided Uno SDK version is installed.")]
+        public string? UnoSdkVersion { get; set; }
 	}
 }
diff --git a/UnoCheck/Checkups/UnoSdkCheckup.cs b/UnoCheck/Checkups/UnoSdkCheckup.cs
@@ -19,28 +19,34 @@ internal class UnoSdkCheckup : Checkup
 
 		public override async Task<DiagnosticResult> Examine(SharedState state)
 		{
-			state.TryGetState("unosdk", "unoSdkLatestVersion", out string unoSdkLatestVersion);
+			string unoSdkVersion;
+			if (state.TryGetEnvironmentVariable("UnoSdkVersion", out var version))
+			{
+				unoSdkVersion = version;
+			}
+			else
+			{
+				state.TryGetState("unosdk", "unoSdkLatestVersion", out unoSdkVersion);
 
-			unoSdkLatestVersion ??= (await NuGetHelper.GetLatestPackageVersionAsync("Uno.Sdk", ToolInfo.CurrentVersion.IsPrerelease)).ToString();
+				unoSdkVersion ??= (await NuGetHelper.GetLatestPackageVersionAsync("Uno.Sdk", ToolInfo.CurrentVersion.IsPrerelease)).ToString();	
+			}
 
 			var defaultSettings = Settings.LoadDefaultSettings(root: null);
 
 			var packagesPath = SettingsUtility.GetGlobalPackagesFolder(defaultSettings);
 
-			if (Directory.Exists(Path.Combine(packagesPath, "uno.sdk", unoSdkLatestVersion)))
+			if (Directory.Exists(Path.Combine(packagesPath, "uno.sdk", unoSdkVersion)))
 			{
 				return DiagnosticResult.Ok(this);
 			}
-			else
-			{
-				state.ContributeState(this, "unoSdkLatestVersion", unoSdkLatestVersion);
 
-				return new DiagnosticResult(
-					Status.Error,
-					this,
-					$"Uno.Sdk {unoSdkLatestVersion} is not installed.",
-					new Suggestion($"Install Uno.Sdk {unoSdkLatestVersion}", new UnoSdkSolution()));
-			}
+			state.ContributeState(this, "unoSdkLatestVersion", unoSdkVersion);
+
+			return new DiagnosticResult(
+				Status.Error,
+				this,
+				$"Uno.Sdk {unoSdkVersion} is not installed.",
+				new Suggestion($"Install Uno.Sdk {unoSdkVersion}", new UnoSdkSolution()));
 		}
 	}
 }