@@ -12,6 +12,7 @@ namespace Microsoft.WingetCreateCLI.Commands
1212 using AutoMapper ;
1313 using CommandLine ;
1414 using CommandLine . Text ;
15+ using Microsoft . Extensions . Logging . Abstractions ;
1516 using Microsoft . WingetCreateCLI . Logging ;
1617 using Microsoft . WingetCreateCLI . Models . Settings ;
1718 using Microsoft . WingetCreateCLI . Properties ;
@@ -614,31 +615,33 @@ private static string ExtractArchiveAndRetrieveDirectoryPath(string packageFileP
614615 private static Manifests ConvertSingletonToMultifileManifest ( WingetCreateCore . Models . Singleton . SingletonManifest singletonManifest )
615616 {
616617 // Create automapping configuration
617- var config = new MapperConfiguration ( cfg =>
618- {
619- cfg . AllowNullCollections = true ;
620- cfg . CreateMap < WingetCreateCore . Models . Singleton . SingletonManifest , VersionManifest > ( )
621- . ForMember ( dest => dest . DefaultLocale , opt => opt . MapFrom ( src => src . PackageLocale ) )
622- . ForMember ( dest => dest . ManifestVersion , opt => opt . Ignore ( ) ) ;
623- cfg . CreateMap < WingetCreateCore . Models . Singleton . SingletonManifest , DefaultLocaleManifest > ( ) . ForMember ( dest => dest . ManifestVersion , opt => opt . Ignore ( ) ) ;
624- cfg . CreateMap < WingetCreateCore . Models . Singleton . SingletonManifest , InstallerManifest > ( )
625- . ForMember ( dest => dest . ManifestVersion , opt => opt . Ignore ( ) ) ;
626- cfg . CreateMap < WingetCreateCore . Models . Singleton . Dependencies , WingetCreateCore . Models . Installer . Dependencies > ( ) ;
627- cfg . CreateMap < WingetCreateCore . Models . Singleton . Installer , WingetCreateCore . Models . Installer . Installer > ( ) ;
628- cfg . CreateMap < WingetCreateCore . Models . Singleton . InstallerSwitches , WingetCreateCore . Models . Installer . InstallerSwitches > ( ) ;
629- cfg . CreateMap < WingetCreateCore . Models . Singleton . AppsAndFeaturesEntry , WingetCreateCore . Models . Installer . AppsAndFeaturesEntry > ( ) ;
630- cfg . CreateMap < WingetCreateCore . Models . Singleton . ExpectedReturnCode , WingetCreateCore . Models . Installer . ExpectedReturnCode > ( ) ;
631- cfg . CreateMap < WingetCreateCore . Models . Singleton . PackageDependencies , WingetCreateCore . Models . Installer . PackageDependencies > ( ) ;
632- cfg . CreateMap < WingetCreateCore . Models . Singleton . Markets , WingetCreateCore . Models . Installer . Markets > ( ) ;
633- cfg . CreateMap < WingetCreateCore . Models . Singleton . Markets2 , WingetCreateCore . Models . Installer . Markets2 > ( ) ; // Markets2 is not used, but is required to satisfy mapping configuration.
634- cfg . CreateMap < WingetCreateCore . Models . Singleton . Agreement , WingetCreateCore . Models . DefaultLocale . Agreement > ( ) ;
635- cfg . CreateMap < WingetCreateCore . Models . Singleton . Documentation , WingetCreateCore . Models . DefaultLocale . Documentation > ( ) ;
636- cfg . CreateMap < WingetCreateCore . Models . Singleton . NestedInstallerFile , WingetCreateCore . Models . Installer . NestedInstallerFile > ( ) ;
637- cfg . CreateMap < WingetCreateCore . Models . Singleton . Files , WingetCreateCore . Models . Installer . Files > ( ) ;
638- cfg . CreateMap < WingetCreateCore . Models . Singleton . InstallationMetadata , WingetCreateCore . Models . Installer . InstallationMetadata > ( ) ;
639- cfg . CreateMap < WingetCreateCore . Models . Singleton . Icon , WingetCreateCore . Models . DefaultLocale . Icon > ( ) ;
640- cfg . CreateMap < WingetCreateCore . Models . Singleton . Authentication , WingetCreateCore . Models . Installer . Authentication > ( ) ;
641- } ) ;
618+ var config = new MapperConfiguration (
619+ cfg =>
620+ {
621+ cfg . AllowNullCollections = true ;
622+ cfg . CreateMap < WingetCreateCore . Models . Singleton . SingletonManifest , VersionManifest > ( )
623+ . ForMember ( dest => dest . DefaultLocale , opt => opt . MapFrom ( src => src . PackageLocale ) )
624+ . ForMember ( dest => dest . ManifestVersion , opt => opt . Ignore ( ) ) ;
625+ cfg . CreateMap < WingetCreateCore . Models . Singleton . SingletonManifest , DefaultLocaleManifest > ( ) . ForMember ( dest => dest . ManifestVersion , opt => opt . Ignore ( ) ) ;
626+ cfg . CreateMap < WingetCreateCore . Models . Singleton . SingletonManifest , InstallerManifest > ( )
627+ . ForMember ( dest => dest . ManifestVersion , opt => opt . Ignore ( ) ) ;
628+ cfg . CreateMap < WingetCreateCore . Models . Singleton . Dependencies , WingetCreateCore . Models . Installer . Dependencies > ( ) ;
629+ cfg . CreateMap < WingetCreateCore . Models . Singleton . Installer , WingetCreateCore . Models . Installer . Installer > ( ) ;
630+ cfg . CreateMap < WingetCreateCore . Models . Singleton . InstallerSwitches , WingetCreateCore . Models . Installer . InstallerSwitches > ( ) ;
631+ cfg . CreateMap < WingetCreateCore . Models . Singleton . AppsAndFeaturesEntry , WingetCreateCore . Models . Installer . AppsAndFeaturesEntry > ( ) ;
632+ cfg . CreateMap < WingetCreateCore . Models . Singleton . ExpectedReturnCode , WingetCreateCore . Models . Installer . ExpectedReturnCode > ( ) ;
633+ cfg . CreateMap < WingetCreateCore . Models . Singleton . PackageDependencies , WingetCreateCore . Models . Installer . PackageDependencies > ( ) ;
634+ cfg . CreateMap < WingetCreateCore . Models . Singleton . Markets , WingetCreateCore . Models . Installer . Markets > ( ) ;
635+ cfg . CreateMap < WingetCreateCore . Models . Singleton . Markets2 , WingetCreateCore . Models . Installer . Markets2 > ( ) ; // Markets2 is not used, but is required to satisfy mapping configuration.
636+ cfg . CreateMap < WingetCreateCore . Models . Singleton . Agreement , WingetCreateCore . Models . DefaultLocale . Agreement > ( ) ;
637+ cfg . CreateMap < WingetCreateCore . Models . Singleton . Documentation , WingetCreateCore . Models . DefaultLocale . Documentation > ( ) ;
638+ cfg . CreateMap < WingetCreateCore . Models . Singleton . NestedInstallerFile , WingetCreateCore . Models . Installer . NestedInstallerFile > ( ) ;
639+ cfg . CreateMap < WingetCreateCore . Models . Singleton . Files , WingetCreateCore . Models . Installer . Files > ( ) ;
640+ cfg . CreateMap < WingetCreateCore . Models . Singleton . InstallationMetadata , WingetCreateCore . Models . Installer . InstallationMetadata > ( ) ;
641+ cfg . CreateMap < WingetCreateCore . Models . Singleton . Icon , WingetCreateCore . Models . DefaultLocale . Icon > ( ) ;
642+ cfg . CreateMap < WingetCreateCore . Models . Singleton . Authentication , WingetCreateCore . Models . Installer . Authentication > ( ) ;
643+ } ,
644+ NullLoggerFactory . Instance ) ;
642645 var mapper = config . CreateMapper ( ) ;
643646
644647 Manifests manifests = new Manifests ( ) ;
0 commit comments