util update

Author: yao-msft

src/WinGetUtilInterop.UnitTests/ManifestUnitTest/V1ManifestReadTest.cs

@@ -38,6 +38,7 @@ private enum TestManifestVersion
             V1_9_0,
             V1_10_0,
             V1_12_0,
+            V1_28_0,
         }
 
         /// <summary>
@@ -81,6 +82,11 @@ public void ReadV1ManifestsAndVerifyContents()
                 Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "TestCollateral", ManifestStrings.V1_12_0ManifestMerged));
 
             this.ValidateManifestFields(v1_12_0manifest, TestManifestVersion.V1_12_0);
+
+            Manifest v1_28_0manifest = Manifest.CreateManifestFromPath(
+                Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "TestCollateral", ManifestStrings.V1_28_0ManifestMerged));
+
+            this.ValidateManifestFields(v1_28_0manifest, TestManifestVersion.V1_28_0);
         }
 
         /// <summary>
@@ -500,6 +506,31 @@ private void ValidateManifestFields(Manifest manifest, TestManifestVersion manif
                 Assert.Equal("https://www.microsoft.com/msixsdk/msixsdkx64.exe", installer4.Url);
                 Assert.Equal("69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82", installer4.Sha256);
             }
+
+            if (manifestVersion >= TestManifestVersion.V1_28_0)
+            {
+                // Root level DesiredStateConfiguration
+                Assert.NotNull(manifest.DesiredStateConfiguration);
+                Assert.Single(manifest.DesiredStateConfiguration.PowerShell);
+                Assert.Equal("https://www.powershellgallery.com/api/v2", manifest.DesiredStateConfiguration.PowerShell[0].RepositoryUrl);
+                Assert.Equal("DefaultTestModule", manifest.DesiredStateConfiguration.PowerShell[0].ModuleName);
+                Assert.Single(manifest.DesiredStateConfiguration.PowerShell[0].Resources);
+                Assert.Equal("DefaultTestResource", manifest.DesiredStateConfiguration.PowerShell[0].Resources[0].Name);
+                Assert.NotNull(manifest.DesiredStateConfiguration.DSCv3);
+                Assert.Single(manifest.DesiredStateConfiguration.DSCv3.Resources);
+                Assert.Equal("DefaultPublisher.DefaultProduct/DefaultResource", manifest.DesiredStateConfiguration.DSCv3.Resources[0].Type);
+
+                // Installer level DesiredStateConfiguration
+                Assert.NotNull(installer1.DesiredStateConfiguration);
+                Assert.Single(installer1.DesiredStateConfiguration.PowerShell);
+                Assert.Equal("https://www.powershellgallery.com/api/v2", installer1.DesiredStateConfiguration.PowerShell[0].RepositoryUrl);
+                Assert.Equal("TestModule", installer1.DesiredStateConfiguration.PowerShell[0].ModuleName);
+                Assert.Single(installer1.DesiredStateConfiguration.PowerShell[0].Resources);
+                Assert.Equal("TestResource", installer1.DesiredStateConfiguration.PowerShell[0].Resources[0].Name);
+                Assert.NotNull(installer1.DesiredStateConfiguration.DSCv3);
+                Assert.Single(installer1.DesiredStateConfiguration.DSCv3.Resources);
+                Assert.Equal("TestPublisher.TestProduct/TestResource", installer1.DesiredStateConfiguration.DSCv3.Resources[0].Type);
+            }
         }
 
         /// <summary>
@@ -542,6 +573,11 @@ internal class ManifestStrings
             /// Merged v1.12 manifest.
             /// </summary>
             public const string V1_12_0ManifestMerged = "V1_12ManifestMerged.yaml";
+
+            /// <summary>
+            /// Merged v1.28 manifest.
+            /// </summary>
+            public const string V1_28_0ManifestMerged = "V1_28ManifestMerged.yaml";
 #pragma warning restore SA1310 // FieldNamesMustNotContainUnderscore
 
             /// <summary>

src/WinGetUtilInterop.UnitTests/TestCollateral/V1_28ManifestMerged.yaml

@@ -0,0 +1,296 @@
+PackageIdentifier: microsoft.msixsdk
+PackageVersion: 1.7.32
+PackageLocale: en-US
+Publisher: Microsoft
+PublisherUrl: https://www.microsoft.com
+PublisherSupportUrl: https://www.microsoft.com/support
+PrivacyUrl: https://www.microsoft.com/privacy
+Author: Microsoft
+PackageName: MSIX SDK
+PackageUrl: https://www.microsoft.com/msixsdk/home
+License: MIT License
+LicenseUrl: https://www.microsoft.com/msixsdk/license
+Copyright: Copyright Microsoft Corporation
+CopyrightUrl: https://www.microsoft.com/msixsdk/copyright
+ShortDescription: This is MSIX SDK
+Description: The MSIX SDK project is an effort to enable developers
+Moniker: msixsdk
+Tags:
+  - "appxsdk"
+  - "msixsdk"
+ReleaseNotes: Default release notes
+ReleaseNotesUrl: https://DefaultReleaseNotes.net
+PurchaseUrl: https://DefaultPurchaseUrl.com
+InstallationNotes: Default installation notes
+Documentations:
+  - DocumentLabel: Default document label
+    DocumentUrl: https://DefaultDocumentUrl.com
+Icons:
+  - IconUrl: https://testIcon
+    IconFileType: ico
+    IconResolution: custom
+    IconTheme: default
+    IconSha256: 69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8123
+Agreements:
+  - AgreementLabel: DefaultLabel
+    Agreement: DefaultText
+    AgreementUrl: https://DefaultAgreementUrl.net
+InstallerLocale: en-US
+Platform:
+  - Windows.Desktop
+  - Windows.Universal
+MinimumOSVersion: 10.0.0.0
+InstallerType: zip
+Scope: machine
+InstallModes:
+  - interactive
+  - silent
+  - silentWithProgress
+InstallerSwitches:
+  Custom: /custom
+  SilentWithProgress: /silentwithprogress
+  Silent: /silence
+  Interactive: /interactive
+  Log: /log=<LOGPATH>
+  InstallLocation: /dir=<INSTALLPATH>
+  Upgrade: /upgrade
+  Repair: /repair
+InstallerSuccessCodes:
+  - 1
+  - 0x80070005
+UpgradeBehavior: uninstallPrevious
+Commands:
+  - makemsix
+  - makeappx
+Protocols:
+  - protocol1
+  - protocol2
+FileExtensions:
+  - appx
+  - msix
+  - appxbundle
+  - msixbundle
+Dependencies:
+  WindowsFeatures:
+    - IIS
+  WindowsLibraries:
+    - VC Runtime
+  PackageDependencies:
+    - PackageIdentifier: Microsoft.MsixSdkDep
+      MinimumVersion: 1.0.0
+  ExternalDependencies:
+    - Outside dependencies
+Capabilities:
+  - internetClient
+RestrictedCapabilities:
+  - runFullTrust
+PackageFamilyName: Microsoft.DesktopAppInstaller_8wekyb3d8bbwe
+ProductCode: "{Foo}"
+ReleaseDate: 2021-01-01
+InstallerAbortsTerminal: true
+InstallLocationRequired: true
+RequireExplicitUpgrade: true
+DisplayInstallWarnings: true
+ElevationRequirement: elevatesSelf
+UnsupportedOSArchitectures:
+  - arm
+AppsAndFeaturesEntries:
+  - DisplayName: DisplayName
+    DisplayVersion: DisplayVersion
+    Publisher: Publisher
+    ProductCode: ProductCode
+    UpgradeCode: UpgradeCode
+    InstallerType: exe
+Markets:
+  AllowedMarkets:
+    - US
+ExpectedReturnCodes:
+    - InstallerReturnCode: 2
+      ReturnResponse: contactSupport
+      ReturnResponseUrl: https://defaultReturnResponseUrl.com
+    - InstallerReturnCode: 3
+      ReturnResponse: custom
+UnsupportedArguments:
+  - log
+NestedInstallerType: msi
+NestedInstallerFiles:
+  - RelativeFilePath: RelativeFilePath
+    PortableCommandAlias: PortableCommandAlias
+InstallationMetadata:
+  DefaultInstallLocation: "%ProgramFiles%\\TestApp"
+  Files:
+    - RelativeFilePath: "main.exe"
+      FileSha256: 69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82
+      FileType: launch
+      InvocationParameter: "/arg"
+      DisplayName: "DisplayName"
+DownloadCommandProhibited: true
+ArchiveBinariesDependOnPath: true
+RepairBehavior: uninstaller
+Authentication:
+  AuthenticationType: microsoftEntraId
+  MicrosoftEntraIdAuthenticationInfo:
+    Resource: DefaultResource
+    Scope: DefaultScope
+DesiredStateConfiguration:
+  PowerShell:
+    - RepositoryUrl: https://www.powershellgallery.com/api/v2
+      ModuleName: DefaultTestModule
+      Resources:
+        - Name: DefaultTestResource
+  DSCv3:
+    Resources:
+      - Type: DefaultPublisher.DefaultProduct/DefaultResource
+Localization:
+- Agreements:
+  - Agreement: Text
+    AgreementLabel: Label
+    AgreementUrl: https://AgreementUrl.net
+  Author: Microsoft UK
+  Copyright: Copyright Microsoft Corporation UK
+  CopyrightUrl: https://www.microsoft.com/msixsdk/copyright/UK
+  Description: The MSIX SDK project is an effort to enable developers UK
+  License: MIT License UK
+  LicenseUrl: https://www.microsoft.com/msixsdk/license/UK
+  PackageLocale: en-GB
+  PackageName: MSIX SDK UK
+  PackageUrl: https://www.microsoft.com/msixsdk/home/UK
+  PrivacyUrl: https://www.microsoft.com/privacy/UK
+  Publisher: Microsoft UK
+  PublisherSupportUrl: https://www.microsoft.com/support/UK
+  PublisherUrl: https://www.microsoft.com/UK
+  ReleaseNotes: Release notes
+  ReleaseNotesUrl: https://ReleaseNotes.net
+  ShortDescription: This is MSIX SDK UK
+  Tags:
+  - appxsdkUK
+  - msixsdkUK
+  PurchaseUrl: https://PurchaseUrl.com
+  InstallationNotes: Installation notes
+  Documentations:
+  - DocumentLabel: Document label
+    DocumentUrl: https://DocumentUrl.com
+  Icons:
+  - IconUrl: https://testIcon2
+    IconFileType: png
+    IconResolution: 32x32
+    IconTheme: dark
+    IconSha256: 69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8321
+Installers:
+  - Architecture: x86
+    InstallerLocale: en-GB
+    Platform:
+      - Windows.Desktop
+    MinimumOSVersion: 10.0.1.0
+    InstallerType: msix
+    InstallerUrl: https://www.microsoft.com/msixsdk/msixsdkx86.msix
+    InstallerSha256: 69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82
+    SignatureSha256: 69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82
+    Scope: user
+    InstallModes:
+      - interactive
+    InstallerSwitches:
+      Custom: /c
+      SilentWithProgress: /sp
+      Silent: /s
+      Interactive: /i
+      Log: /l=<LOGPATH>
+      InstallLocation: /d=<INSTALLPATH>
+      Upgrade: /u
+      Repair: /r
+    UpgradeBehavior: install
+    Commands:
+      - makemsixPreview
+      - makeappxPreview
+    Protocols:
+      - protocol1preview
+      - protocol2preview
+    FileExtensions:
+      - appxbundle
+      - msixbundle
+      - appx
+      - msix
+    Dependencies:
+      WindowsFeatures:
+        - PreviewIIS
+      WindowsLibraries:
+        - Preview VC Runtime
+      PackageDependencies:
+        - PackageIdentifier: Microsoft.MsixSdkDepPreview
+          MinimumVersion: 1.0.0
+      ExternalDependencies:
+        - Preview Outside dependencies
+    PackageFamilyName: Microsoft.DesktopAppInstallerPreview_8wekyb3d8bbwe
+    Capabilities:
+      - internetClientPreview
+    RestrictedCapabilities:
+      - runFullTrustPreview
+    ReleaseDate: 2021-02-02
+    InstallerAbortsTerminal: false
+    InstallLocationRequired: false
+    NestedInstallerFiles:
+      - RelativeFilePath: RelativeFilePath2
+        PortableCommandAlias: PortableCommandAlias2
+    RequireExplicitUpgrade: false
+    DisplayInstallWarnings: true
+    ElevationRequirement: elevationRequired
+    NestedInstallerType: msi
+    UnsupportedArguments:
+      - location
+    UnsupportedOSArchitectures:
+      - arm64
+    Markets:
+      ExcludedMarkets:
+        - "US"
+    ExpectedReturnCodes:
+      - InstallerReturnCode: 2
+        ReturnResponse: contactSupport
+        ReturnResponseUrl: https://returnResponseUrl.com
+    DownloadCommandProhibited: true
+    ArchiveBinariesDependOnPath: false
+    RepairBehavior: modify
+    InstallationMetadata:
+      DefaultInstallLocation: "%ProgramFiles%\\TestApp"
+      Files:
+        - RelativeFilePath: "main2.exe"
+          FileSha256: 79D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82
+          FileType: launch2
+          InvocationParameter: "/arg2"
+          DisplayName: "DisplayName2"
+    Authentication:
+      AuthenticationType: microsoftEntraId
+      MicrosoftEntraIdAuthenticationInfo:
+        Resource: Resource
+        Scope: Scope
+    DesiredStateConfiguration:
+      PowerShell:
+        - RepositoryUrl: https://www.powershellgallery.com/api/v2
+          ModuleName: TestModule
+          Resources:
+            - Name: TestResource
+      DSCv3:
+        Resources:
+          - Type: TestPublisher.TestProduct/TestResource
+  - Architecture: x64
+    InstallerSha256: 69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82
+    InstallerUrl: https://www.microsoft.com/msixsdk/msixsdkx64.exe
+    InstallerType: exe
+    ProductCode: '{Bar}'
+    MSStoreProductIdentifier: fakeIdentifier
+  - Architecture: neutral
+    InstallerType: zip
+    InstallerUrl: https://www.microsoft.com/msixsdk/msixsdkx64.exe
+    InstallerSha256: 69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82
+    NestedInstallerType: font
+    NestedInstallerFiles:
+      - RelativeFilePath: relativeFilePath1.otf
+      - RelativeFilePath: relativeFilePath2.ttf
+      - RelativeFilePath: relativeFilePath3.fnt
+      - RelativeFilePath: relativeFilePath4.ttc
+      - RelativeFilePath: relativeFilePath5.otc
+  - Architecture: neutral
+    InstallerType: font
+    InstallerUrl: https://www.microsoft.com/msixsdk/msixsdkx64.exe
+    InstallerSha256: 69D84CA8899800A5575CE31798293CD4FEBAB1D734A07C2E51E56A28E0DF8C82
+ManifestType: merged
+ManifestVersion: 1.28.0

src/WinGetUtilInterop.UnitTests/WinGetUtilInterop.UnitTests.csproj

@@ -102,6 +102,9 @@
     <None Update="TestCollateral\V1_12ManifestMerged.yaml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="TestCollateral\V1_28ManifestMerged.yaml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>