Add support for manifest v1 (#110)

Migrate all entities to be compatible with v1 version of the manifest
Add extra options from winget (#110)

Author: marcinotorowski

src/Otor.MsixHero.App/Modules/Dialogs/Winget/YamlEditor/View/WingetDialogContent.xaml

@@ -15,6 +15,7 @@
 // https://github.com/marcinotorowski/msix-hero/blob/develop/LICENSE.md
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -41,13 +42,19 @@ public WingetInstallerViewModel(YamlUtils yamlUtils, IInteractionService interac
             this.interactionService = interactionService;
             this.AddChildren(
                 this.Architecture = new ChangeableProperty<YamlArchitecture>(),
-                this.SystemAppId = new ValidatedChangeableProperty<string>("System AppId"),
+                this.PlatformUwp = new ChangeableProperty<bool>(this.Model?.Platform?.Contains(YamlPlatform.WindowsUniversal) == true),
+                this.PlatformWin32 = new ChangeableProperty<bool>(this.Model?.Platform?.Contains(YamlPlatform.WindowsDesktop) == true),
+                this.ProductCode = new ValidatedChangeableProperty<string>("Product code", ValidatorFactory.ValidateGuid(false)),
+                this.PackageFamilyName = new ValidatedChangeableProperty<string>("Package family name", WingetValidators.GetPackageFamilyNameError),
                 this.SignatureSha256 = new ValidatedChangeableProperty<string>("Signature hash", ValidatorFactory.ValidateSha256(false)),
                 this.Scope = new ChangeableProperty<YamlScope>(),
-                this.SilentCommand = new ChangeableProperty<string>(),
-                this.CustomCommand = new ChangeableProperty<string>(),
-                this.InstallerType = new ValidatedChangeableProperty<YamlInstallerType>("Installer type", ValidateInstallerType),
-                this.SilentCommandWithProgress = new ChangeableProperty<string>()
+                this.SilentCommand = new ValidatedChangeableProperty<string>("Silent command", WingetValidators.GetInstallerSwitchesError),
+                this.InteractiveCommand = new ValidatedChangeableProperty<string>("Interactive command", WingetValidators.GetInstallerSwitchesError),
+                this.LogCommand = new ValidatedChangeableProperty<string>("Log command", WingetValidators.GetInstallerSwitchesError),
+                this.UpgradeCommand = new ValidatedChangeableProperty<string>("Upgrade command", WingetValidators.GetInstallerSwitchesError),
+                this.CustomCommand = new ValidatedChangeableProperty<string>("Custom command", WingetValidators.GetCustomInstallerSwitchesError),
+                this.SilentCommandWithProgress = new ValidatedChangeableProperty<string>("Silent command with progress", WingetValidators.GetInstallerSwitchesError),
+                this.InstallerType = new ValidatedChangeableProperty<YamlInstallerType>("Installer type", ValidateInstallerType)
             );
 
             this.InstallerType.ValueChanged += InstallerTypeOnValueChanged;
@@ -57,14 +64,25 @@ public void SetData(YamlInstaller installer, bool useNullValues = true)
         {
             this.Model = installer;
 
-            if (useNullValues || installer.Arch != default)
+            if (useNullValues || installer.Architecture != default)
             {
-                this.Architecture.CurrentValue = installer?.Arch ?? YamlArchitecture.none;
+                this.Architecture.CurrentValue = installer?.Architecture ?? YamlArchitecture.None;
             }
 
-            if (useNullValues || installer.SystemAppId != null)
+            if (useNullValues || installer.Platform != default)
             {
-                this.SystemAppId.CurrentValue = installer?.SystemAppId;
+                this.PlatformUwp.CurrentValue = installer?.Platform?.Contains(YamlPlatform.WindowsUniversal) == true;
+                this.PlatformWin32.CurrentValue = installer?.Platform?.Contains(YamlPlatform.WindowsDesktop) == true;
+            }
+
+            if (useNullValues || installer.ProductCode != null)
+            {
+                this.ProductCode.CurrentValue = installer?.ProductCode;
+            }
+
+            if (useNullValues || installer.PackageFamilyName != null)
+            {
+                this.PackageFamilyName.CurrentValue = installer?.PackageFamilyName;
             }
 
             if (useNullValues || installer.SignatureSha256 != null)
@@ -74,43 +92,70 @@ public void SetData(YamlInstaller installer, bool useNullValues = true)
 
             if (useNullValues || installer.Scope != default)
             {
-                this.Scope.CurrentValue = installer?.Scope ?? YamlScope.none;
+                this.Scope.CurrentValue = installer?.Scope ?? YamlScope.None;
             }
 
-            if (useNullValues || installer.Switches?.Silent != null)
+            if (useNullValues || installer.InstallerSwitches?.Silent != null)
+            {
+                this.SilentCommand.CurrentValue = installer?.InstallerSwitches?.Silent;
+            }
+            
+            if (useNullValues || installer.InstallerSwitches?.Custom != null)
             {
-                this.SilentCommand.CurrentValue = installer?.Switches?.Silent;
+                this.CustomCommand.CurrentValue = installer?.InstallerSwitches?.Custom;
             }
 
-            if (useNullValues || installer.Switches?.Custom != null)
+            if (useNullValues || installer.InstallerSwitches?.SilentWithProgress != default)
             {
-                this.CustomCommand.CurrentValue = installer?.Switches?.Custom;
+                this.SilentCommandWithProgress.CurrentValue = installer?.InstallerSwitches?.SilentWithProgress;
+            }
+            
+            if (useNullValues || installer.InstallerSwitches?.Interactive != default)
+            {
+                this.InteractiveCommand.CurrentValue = installer?.InstallerSwitches?.Interactive;
             }
 
-            if (useNullValues || installer.InstallerType != default)
+            if (useNullValues || installer.InstallerSwitches?.Upgrade != default)
+            {
+                this.UpgradeCommand.CurrentValue = installer?.InstallerSwitches?.Upgrade;
+            }
+
+            if (useNullValues || installer.InstallerSwitches?.Log != default)
             {
-                this.InstallerType.CurrentValue = installer?.InstallerType ?? YamlInstallerType.none;
+                this.LogCommand.CurrentValue = installer?.InstallerSwitches?.Log;
             }
 
-            if (useNullValues || installer.Arch != default)
+            if (useNullValues || installer.InstallerType != default)
             {
-                this.SilentCommandWithProgress.CurrentValue = installer?.Switches?.SilentWithProgress;
+                this.InstallerType.CurrentValue = installer?.InstallerType ?? YamlInstallerType.None;
             }
 
             this.Commit();
         }
 
         public ChangeableProperty<YamlArchitecture> Architecture { get; }
+        
+        public ChangeableProperty<bool> PlatformUwp { get; }
+        
+        public ChangeableProperty<bool> PlatformWin32 { get; }
 
         public ChangeableProperty<YamlInstallerType> InstallerType { get; }
 
         public ChangeableProperty<YamlScope> Scope { get; }
 
-        public ChangeableProperty<string> SystemAppId { get; }
+        public ChangeableProperty<string> ProductCode { get; }
+
+        public ChangeableProperty<string> PackageFamilyName { get; }
 
         public ValidatedChangeableProperty<string> SignatureSha256 { get; }
 
         public ChangeableProperty<string> SilentCommand { get; }
+        
+        public ChangeableProperty<string> InteractiveCommand { get; }
+        
+        public ChangeableProperty<string> LogCommand { get; }
+        
+        public ChangeableProperty<string> UpgradeCommand { get; }
 
         public ChangeableProperty<string> CustomCommand { get; }
 
@@ -120,16 +165,16 @@ public void SetData(YamlInstaller installer, bool useNullValues = true)
 
         public string Url { get; set; }
 
-        public bool IsMsix => this.InstallerType.CurrentValue == YamlInstallerType.msix || this.InstallerType.CurrentValue == YamlInstallerType.appx;
+        public bool IsMsix => this.InstallerType.CurrentValue == YamlInstallerType.Msix || this.InstallerType.CurrentValue == YamlInstallerType.Appx;
 
         public bool IsCommand
         {
             get
             {
                 switch (this.InstallerType.CurrentValue)
                 {
-                    case YamlInstallerType.none:
-                    case YamlInstallerType.exe:
+                    case YamlInstallerType.None:
+                    case YamlInstallerType.Exe:
                         return true;
                     default:
                         return false;
@@ -229,43 +274,57 @@ public override void Commit()
         {
             base.Commit();
 
-            this.Model.SystemAppId = this.SystemAppId.CurrentValue;
-
-            if (this.Architecture.CurrentValue == YamlArchitecture.none)
-            {
-                this.Model.Arch = 0;
-            }
-            else
-            {
-                this.Model.Arch = this.Architecture.CurrentValue;
-            }
-
-            if (this.Scope.CurrentValue == YamlScope.none)
+            this.Model.PackageFamilyName = this.PackageFamilyName.CurrentValue;
+            this.Model.ProductCode = this.ProductCode.CurrentValue;
+            this.Model.Architecture = this.Architecture.CurrentValue;
+            
+            if (!this.PlatformUwp.CurrentValue && !this.PlatformWin32.CurrentValue)
             {
-                this.Model.Scope = default;
+                this.Model.Platform = null;
             }
             else
             {
-                this.Model.Scope = this.Scope.CurrentValue;
+                this.Model.Platform = new List<YamlPlatform>();
+                if (this.PlatformWin32.CurrentValue)
+                {
+                    this.Model.Platform.Add(YamlPlatform.WindowsDesktop);
+                }
+                
+                if (this.PlatformUwp.CurrentValue)
+                {
+                    this.Model.Platform.Add(YamlPlatform.WindowsUniversal);
+                }
             }
-
-            if (string.IsNullOrEmpty(this.SilentCommandWithProgress.CurrentValue) && string.IsNullOrEmpty(this.SilentCommand.CurrentValue))
+            
+            this.Model.Scope = this.Scope.CurrentValue;
+
+            if (
+                string.IsNullOrWhiteSpace(this.SilentCommandWithProgress.CurrentValue) && 
+                string.IsNullOrWhiteSpace(this.SilentCommand.CurrentValue) && 
+                string.IsNullOrWhiteSpace(this.UpgradeCommand.CurrentValue) && 
+                string.IsNullOrWhiteSpace(this.LogCommand.CurrentValue) && 
+                string.IsNullOrWhiteSpace(this.InteractiveCommand.CurrentValue) && 
+                string.IsNullOrWhiteSpace(this.CustomCommand.CurrentValue))
             {
-                this.Model.Switches = null;
+                this.Model.InstallerSwitches = null;
             }
-            else if (this.Model.Switches == null)
+            else if (this.Model.InstallerSwitches == null)
             {
-                this.Model.Switches = new YamlSwitches();
+                this.Model.InstallerSwitches = new YamlInstallerSwitches();
             }
 
-            if (this.Model.Switches != null)
+            if (this.Model.InstallerSwitches != null)
             {
-                this.Model.Switches.SilentWithProgress = this.SilentCommandWithProgress.CurrentValue;
-                this.Model.Switches.Silent = this.SilentCommand.CurrentValue;
-                this.Model.Switches.Custom = this.CustomCommand.CurrentValue;
+                this.Model.InstallerSwitches.SilentWithProgress = this.SilentCommandWithProgress.CurrentValue;
+                this.Model.InstallerSwitches.Silent = this.SilentCommand.CurrentValue;
+                this.Model.InstallerSwitches.Custom = this.CustomCommand.CurrentValue;
+                this.Model.InstallerSwitches.Interactive = this.InteractiveCommand.CurrentValue;
+                this.Model.InstallerSwitches.Log = this.LogCommand.CurrentValue;
+                this.Model.InstallerSwitches.Upgrade = this.UpgradeCommand.CurrentValue;
             }
 
-            this.Model.SystemAppId = this.SystemAppId.CurrentValue;
+            this.Model.ProductCode = this.ProductCode.CurrentValue;
+            this.Model.PackageFamilyName = this.PackageFamilyName.CurrentValue;
             this.Model.SignatureSha256 = this.SignatureSha256.CurrentValue;
         }
 
@@ -277,7 +336,7 @@ private void InstallerTypeOnValueChanged(object sender, ValueChangedEventArgs e)
 
         private string ValidateInstallerType(YamlInstallerType value)
         {
-            if (value == YamlInstallerType.none)
+            if (value == YamlInstallerType.None)
             {
                 return "The installation type must be selected.";
             }

src/Otor.MsixHero.App/Modules/Dialogs/Winget/YamlEditor/ViewModel/WingetDefinitionViewModel.cs

@@ -37,7 +37,7 @@ public void TestNsis()
             using (var s = typeof(InstallerTypeDetectorTests).Assembly.GetManifestResourceStream(nsis))
             {
                 var detect = sd.DetectSetupType(s).Result;
-                Assert.AreEqual(YamlInstallerType.nullsoft, detect);
+                Assert.AreEqual(YamlInstallerType.Nullsoft, detect);
             }
         }
 
@@ -51,7 +51,7 @@ public void TestInno()
             using (var s = typeof(InstallerTypeDetectorTests).Assembly.GetManifestResourceStream(inno))
             {
                 var detect = sd.DetectSetupType(s).Result;
-                Assert.AreEqual(YamlInstallerType.inno, detect);
+                Assert.AreEqual(YamlInstallerType.InnoSetup, detect);
             }
         }
     }

src/Otor.MsixHero.App/Modules/Dialogs/Winget/YamlEditor/ViewModel/WingetInstallerViewModel.cs

@@ -58,66 +58,75 @@ public void TestBasic()
         }
 
         [Test]
-        [Ignore("To be investigated")]
         public void TestEverNote()
         {
-            var evernote = @"Id: evernote.evernote
-Name: Evernote
-AppMoniker: evernote
-Version: 6.24.2.8919
+            var evernote = @"PackageIdentifier: evernote.evernote
+PackageName: Evernote
+Moniker: evernote
+PackageVersion: 6.24.2.8919
 Publisher: Evernote
 Author: Evernote
 License: Copyright (c) 2020 Evernote Corporation. All rights reserved.
 LicenseUrl: https://evernote.com/legal/terms-of-service
-MinOSVersion: 10.0.0.0
-Homepage: https://www.evernote.com
-Description: Evernote helps you focus on what matters most and have access to your information when you need it. Input typed notes or scan handwritten notes. Add to-do’s, photos, images, web pages, or audio ... and it's all instantly searchable. Organize notes any way you want and share with anyone. And Evernote syncs across your devices so your information is always with you, everywhere you go.
-Tags: ""evernote,notes,cloud,online""
+MinimumOSVersion: 10.0.0.0
+PackageUrl: https://www.evernote.com
+ShortDescription: evernote.evernote
+Description: Evernote helps you focus on what matters most and have access to your information when you need it. Input typed notes or scan handwritten notes. Add to-do’s, photos, images, web pages, or audio ... and it’s all instantly searchable. Organize notes any way you want and share with anyone. And Evernote syncs across your devices so your information is always with you, everywhere you go.
+Tags:
+- evernote
+- notes
+- cloud
+- online
 InstallerType: exe
-Installers: 
-  - Arch: x64 
-    Url: https://cdn1.evernote.com/win6/public/Evernote_6.24.2.8919.exe
-    Sha256: 4851DBDB36ECEF1D5F2DE092673B4D70223703F6211FD8A1909B2E3E44AED5F9
-    Language: en-US 
-    Scope: user
-    Switches: 
-      Silent: /qn
-      SilentWithProgress: /qn";
+Installers:
+- Architecture: x64
+  InstallerUrl: https://cdn1.evernote.com/win6/public/Evernote_6.24.2.8919.exe
+  InstallerSha256: 4851DBDB36ECEF1D5F2DE092673B4D70223703F6211FD8A1909B2E3E44AED5F9
+  InstallerLocale: en-US
+  Scope: user
+  InstallerSwitches:
+    Silent: /qn
+    SilentWithProgress: /qn
+PackageLocale: en-US
+ManifestType: singleton
+ManifestVersion: 1.0.0
+";
 
             var reader = new YamlReader();
             using TextReader textReader = new StringReader(evernote);
             var yaml = reader.Read(textReader);
 
-            Assert.AreEqual("evernote.evernote", yaml.Id);
-            Assert.AreEqual("Evernote", yaml.Name);
+            Assert.AreEqual("evernote.evernote", yaml.PackageIdentifier);
+            Assert.AreEqual("Evernote", yaml.PackageName);
             Assert.AreEqual("Evernote", yaml.Publisher);
-            Assert.AreEqual("evernote", yaml.AppMoniker);
+            Assert.AreEqual("evernote", yaml.Moniker);
             Assert.AreEqual("Copyright (c) 2020 Evernote Corporation. All rights reserved.", yaml.License);
             Assert.AreEqual("https://evernote.com/legal/terms-of-service", yaml.LicenseUrl);
-            Assert.AreEqual("6.24.2.8919", yaml.Version);
-            Assert.AreEqual("10.0.0.0", yaml.MinOperatingSystemVersion.ToString());
-            Assert.AreEqual("Evernote helps you focus on what matters most and have access to your information when you need it. Input typed notes or scan handwritten notes. Add to-do’s, photos, images, web pages, or audio ... and it's all instantly searchable. Organize notes any way you want and share with anyone. And Evernote syncs across your devices so your information is always with you, everywhere you go.", yaml.Description);
-            Assert.AreEqual("https://www.evernote.com", yaml.Homepage);
-            Assert.AreEqual("evernote,notes,cloud,online", yaml.Tags);
+            Assert.AreEqual("6.24.2.8919", yaml.PackageVersion);
+            Assert.AreEqual("10.0.0.0", yaml.MinimumOperatingSystemVersion.ToString());
+            Assert.AreEqual("Evernote helps you focus on what matters most and have access to your information when you need it. Input typed notes or scan handwritten notes. Add to-do’s, photos, images, web pages, or audio ... and it’s all instantly searchable. Organize notes any way you want and share with anyone. And Evernote syncs across your devices so your information is always with you, everywhere you go.", yaml.Description);
+            Assert.AreEqual("evernote.evernote", yaml.ShortDescription);
+            Assert.AreEqual("https://www.evernote.com", yaml.PackageUrl);
+            Assert.AreEqual("evernote,notes,cloud,online", string.Join(",", yaml.Tags));
 #pragma warning disable 618
             Assert.AreEqual("Evernote", yaml.Author);
-            Assert.AreEqual(YamlInstallerType.exe, yaml.InstallerType);
+            Assert.AreEqual(YamlInstallerType.Exe, yaml.InstallerType);
 #pragma warning restore 618
             Assert.NotNull(yaml.Installers);
             Assert.AreEqual(1, yaml.Installers.Count);
 
             var ins = yaml.Installers[0];
 
-            Assert.AreEqual(YamlArchitecture.x64, ins.Arch);
-            Assert.AreEqual("https://cdn1.evernote.com/win6/public/Evernote_6.24.2.8919.exe", ins.Url);
+            Assert.AreEqual(YamlArchitecture.X64, ins.Architecture);
+            Assert.AreEqual("https://cdn1.evernote.com/win6/public/Evernote_6.24.2.8919.exe", ins.InstallerUrl);
 #pragma warning disable 618
-            Assert.AreEqual("en-US", ins.Language);
+            Assert.AreEqual("en-US", ins.InstallerLocale);
 #pragma warning restore 618
-            Assert.AreEqual(YamlScope.user, ins.Scope);
-            Assert.NotNull(ins.Switches);
+            Assert.AreEqual(YamlScope.User, ins.Scope);
+            Assert.NotNull(ins.InstallerSwitches);
 
-            Assert.AreEqual("/qn", ins.Switches.Silent);
-            Assert.AreEqual("/qn", ins.Switches.SilentWithProgress);
+            Assert.AreEqual("/qn", ins.InstallerSwitches.Silent);
+            Assert.AreEqual("/qn", ins.InstallerSwitches.SilentWithProgress);
         }
     }
 }