From 1ac7ac81ad258e8e7cf31d748bd99bc094db5454 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Wed, 20 May 2026 13:09:51 -0700 Subject: [PATCH 01/16] Use central package management --- Directory.Packages.props | 34 +++++++++++++++++++ src/WingetCreateCLI.sln | 1 + src/WingetCreateCLI/WingetCreateCLI.csproj | 18 +++++----- src/WingetCreateCore/WingetCreateCore.csproj | 28 +++++++-------- .../WingetCreateTests.csproj | 10 +++--- 5 files changed, 63 insertions(+), 28 deletions(-) create mode 100644 Directory.Packages.props diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..e8b4bb0e --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,34 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/WingetCreateCLI.sln b/src/WingetCreateCLI.sln index e7a47962..dceca8b4 100644 --- a/src/WingetCreateCLI.sln +++ b/src/WingetCreateCLI.sln @@ -20,6 +20,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A1727DC5-E7A5-4899-BF53-EAF658055D61}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + ..\Directory.Packages.props = ..\Directory.Packages.props EndProjectSection EndProject Global diff --git a/src/WingetCreateCLI/WingetCreateCLI.csproj b/src/WingetCreateCLI/WingetCreateCLI.csproj index d1cf3959..c4567154 100644 --- a/src/WingetCreateCLI/WingetCreateCLI.csproj +++ b/src/WingetCreateCLI/WingetCreateCLI.csproj @@ -18,23 +18,23 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -117,4 +117,4 @@ $(TargetFrameworkSDKToolsDirectory)$(PlatformTarget)\ - \ No newline at end of file + diff --git a/src/WingetCreateCore/WingetCreateCore.csproj b/src/WingetCreateCore/WingetCreateCore.csproj index e2a3d99e..d73736fb 100644 --- a/src/WingetCreateCore/WingetCreateCore.csproj +++ b/src/WingetCreateCore/WingetCreateCore.csproj @@ -15,27 +15,27 @@ - - - + + + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj index 30a7fef6..bab9cab5 100644 --- a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj +++ b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj @@ -12,11 +12,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 17e531deeee3a5ec659ee1787b53ba17f66a6d25 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Wed, 20 May 2026 13:15:58 -0700 Subject: [PATCH 02/16] Added packages --- src/WingetCreateCLI/WingetCreateCLI.csproj | 3 +++ src/WingetCreateCore/WingetCreateCore.csproj | 2 ++ src/WingetCreatePackage/WingetCreatePackage.wapproj | 6 ++++++ .../WingetCreateTests/WingetCreateTests.csproj | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/src/WingetCreateCLI/WingetCreateCLI.csproj b/src/WingetCreateCLI/WingetCreateCLI.csproj index c4567154..30cc4fa6 100644 --- a/src/WingetCreateCLI/WingetCreateCLI.csproj +++ b/src/WingetCreateCLI/WingetCreateCLI.csproj @@ -34,7 +34,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/src/WingetCreateCore/WingetCreateCore.csproj b/src/WingetCreateCore/WingetCreateCore.csproj index d73736fb..0c4b07d3 100644 --- a/src/WingetCreateCore/WingetCreateCore.csproj +++ b/src/WingetCreateCore/WingetCreateCore.csproj @@ -33,6 +33,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/WingetCreatePackage/WingetCreatePackage.wapproj b/src/WingetCreatePackage/WingetCreatePackage.wapproj index cacbd589..e30174cb 100644 --- a/src/WingetCreatePackage/WingetCreatePackage.wapproj +++ b/src/WingetCreatePackage/WingetCreatePackage.wapproj @@ -67,5 +67,11 @@ + + + + + + \ No newline at end of file diff --git a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj index bab9cab5..33f87534 100644 --- a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj +++ b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj @@ -12,6 +12,7 @@ + @@ -20,6 +21,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + + From a4371e143511d5753ac98b21abbdab193850a00d Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Wed, 20 May 2026 13:54:05 -0700 Subject: [PATCH 03/16] Fix build --- src/WingetCreateCLI/Commands/UpdateCommand.cs | 53 ++++++++++--------- .../UnitTests/PackageParserTests.cs | 19 ++++--- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/src/WingetCreateCLI/Commands/UpdateCommand.cs b/src/WingetCreateCLI/Commands/UpdateCommand.cs index b53fcfdc..bb208ec3 100644 --- a/src/WingetCreateCLI/Commands/UpdateCommand.cs +++ b/src/WingetCreateCLI/Commands/UpdateCommand.cs @@ -12,6 +12,7 @@ namespace Microsoft.WingetCreateCLI.Commands using AutoMapper; using CommandLine; using CommandLine.Text; + using Microsoft.Extensions.Logging.Abstractions; using Microsoft.WingetCreateCLI.Logging; using Microsoft.WingetCreateCLI.Models.Settings; using Microsoft.WingetCreateCLI.Properties; @@ -614,31 +615,33 @@ private static string ExtractArchiveAndRetrieveDirectoryPath(string packageFileP private static Manifests ConvertSingletonToMultifileManifest(WingetCreateCore.Models.Singleton.SingletonManifest singletonManifest) { // Create automapping configuration - var config = new MapperConfiguration(cfg => - { - cfg.AllowNullCollections = true; - cfg.CreateMap() - .ForMember(dest => dest.DefaultLocale, opt => opt.MapFrom(src => src.PackageLocale)) - .ForMember(dest => dest.ManifestVersion, opt => opt.Ignore()); - cfg.CreateMap().ForMember(dest => dest.ManifestVersion, opt => opt.Ignore()); - cfg.CreateMap() - .ForMember(dest => dest.ManifestVersion, opt => opt.Ignore()); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); // Markets2 is not used, but is required to satisfy mapping configuration. - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - }); + var config = new MapperConfiguration( + cfg => + { + cfg.AllowNullCollections = true; + cfg.CreateMap() + .ForMember(dest => dest.DefaultLocale, opt => opt.MapFrom(src => src.PackageLocale)) + .ForMember(dest => dest.ManifestVersion, opt => opt.Ignore()); + cfg.CreateMap().ForMember(dest => dest.ManifestVersion, opt => opt.Ignore()); + cfg.CreateMap() + .ForMember(dest => dest.ManifestVersion, opt => opt.Ignore()); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); // Markets2 is not used, but is required to satisfy mapping configuration. + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + }, + NullLoggerFactory.Instance); var mapper = config.CreateMapper(); Manifests manifests = new Manifests(); diff --git a/src/WingetCreateTests/WingetCreateTests/UnitTests/PackageParserTests.cs b/src/WingetCreateTests/WingetCreateTests/UnitTests/PackageParserTests.cs index 798dd00f..cc8575b1 100644 --- a/src/WingetCreateTests/WingetCreateTests/UnitTests/PackageParserTests.cs +++ b/src/WingetCreateTests/WingetCreateTests/UnitTests/PackageParserTests.cs @@ -9,6 +9,7 @@ namespace Microsoft.WingetCreateUnitTests using System.IO.Compression; using System.Linq; using AutoMapper; + using Microsoft.Extensions.Logging.Abstractions; using Microsoft.WingetCreateCore; using Microsoft.WingetCreateCore.Common; using Microsoft.WingetCreateCore.Models; @@ -207,14 +208,16 @@ public void ParseAndUpdateZipInstaller() /// Installer Manifest Installer object model. private static Installer ConvertSingletonInstaller(WingetCreateCore.Models.Singleton.Installer installer) { - var config = new MapperConfiguration(cfg => - { - cfg.AllowNullCollections = true; - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - cfg.CreateMap(); - }); + var config = new MapperConfiguration( + cfg => + { + cfg.AllowNullCollections = true; + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + cfg.CreateMap(); + }, + NullLoggerFactory.Instance); var mapper = config.CreateMapper(); return mapper.Map(installer); From 4f9d2c6553319d48763a57a305a97d276ee1797d Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Wed, 20 May 2026 14:09:37 -0700 Subject: [PATCH 04/16] Fix cswin32 version --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e8b4bb0e..6c90884e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ - + @@ -31,4 +31,4 @@ - \ No newline at end of file + From 096c6d8420618a38c0450997a8ae2f3d88f16688 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Wed, 20 May 2026 14:21:04 -0700 Subject: [PATCH 05/16] Fix warning about yamldotnet --- Directory.Packages.props | 2 +- .../Serializers/YamlSerializer.cs | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 6c90884e..1890a76d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -29,6 +29,6 @@ - + diff --git a/src/WingetCreateCore/Serializers/YamlSerializer.cs b/src/WingetCreateCore/Serializers/YamlSerializer.cs index c78e7278..0919c30c 100644 --- a/src/WingetCreateCore/Serializers/YamlSerializer.cs +++ b/src/WingetCreateCore/Serializers/YamlSerializer.cs @@ -136,6 +136,16 @@ public AliasTypeInspector(ITypeInspector innerTypeDescriptor) this.innerTypeDescriptor = innerTypeDescriptor; } + public override string GetEnumName(Type enumType, string value) + { + return this.innerTypeDescriptor.GetEnumName(enumType, value); + } + + public override string GetEnumValue(object enumValue) + { + return this.innerTypeDescriptor.GetEnumValue(enumValue); + } + /// /// Because certain properties were generated incorrectly, we needed to create custom fields for those properties. /// Therefore to resolve naming conflicts during deserialization, we prioritize fields that have the YamlMemberAttribute defined @@ -182,7 +192,7 @@ public bool Accepts(Type type) return type.IsEnum || ((u != null) && u.IsEnum); } - public object ReadYaml(IParser parser, Type type) + public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) { Type u = Nullable.GetUnderlyingType(type); if (u != null) @@ -202,7 +212,7 @@ public object ReadYaml(IParser parser, Type type) return Enum.Parse(type, serializableValues[parsedEnum.Value].Name); } - public void WriteYaml(IEmitter emitter, object value, Type type) + public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer) { var enumMember = type.GetMember(value.ToString()).FirstOrDefault(); var yamlValue = enumMember?.GetCustomAttributes(true).Select(ema => ema.Value).FirstOrDefault() ?? value.ToString(); @@ -217,14 +227,14 @@ public YamlSkipPropertyVisitor(IObjectGraphVisitor nextVisitor) { } - public override bool EnterMapping(IPropertyDescriptor key, IObjectDescriptor value, IEmitter context) + public override bool EnterMapping(IPropertyDescriptor key, IObjectDescriptor value, IEmitter context, ObjectSerializer serializer) { if (key.Name == "AdditionalProperties") { return false; } - return base.EnterMapping(key, value, context); + return base.EnterMapping(key, value, context, serializer); } } From a1be9894740ef3a8e58bef334fd39b947133fc02 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Wed, 20 May 2026 14:35:05 -0700 Subject: [PATCH 06/16] update project reference --- Directory.Packages.props | 1 + src/WingetCreateCLI/WingetCreateCLI.csproj | 7 ++++--- src/WingetCreateCore/WingetCreateCore.csproj | 7 +------ .../WingetCreateTests/WingetCreateTests.csproj | 3 --- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1890a76d..779d54f3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,6 +13,7 @@ + diff --git a/src/WingetCreateCLI/WingetCreateCLI.csproj b/src/WingetCreateCLI/WingetCreateCLI.csproj index 30cc4fa6..5342ead4 100644 --- a/src/WingetCreateCLI/WingetCreateCLI.csproj +++ b/src/WingetCreateCLI/WingetCreateCLI.csproj @@ -21,23 +21,24 @@ + all runtime; build; native; contentfiles; analyzers; buildtransitive + + all runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - diff --git a/src/WingetCreateCore/WingetCreateCore.csproj b/src/WingetCreateCore/WingetCreateCore.csproj index 0c4b07d3..48d4154d 100644 --- a/src/WingetCreateCore/WingetCreateCore.csproj +++ b/src/WingetCreateCore/WingetCreateCore.csproj @@ -16,25 +16,20 @@ - - - + all runtime; build; native; contentfiles; analyzers; buildtransitive - all runtime; build; native; contentfiles; analyzers; buildtransitive - - diff --git a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj index 33f87534..9a5803aa 100644 --- a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj +++ b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj @@ -21,9 +21,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - From ff0072e1691195f315dc441256d8f82d13c32d67 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Wed, 20 May 2026 15:50:03 -0700 Subject: [PATCH 07/16] Use global json --- pipelines/azure-pipelines.release.yml | 8 ++++++++ pipelines/azure-pipelines.yml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/pipelines/azure-pipelines.release.yml b/pipelines/azure-pipelines.release.yml index 12075380..e3d5012c 100644 --- a/pipelines/azure-pipelines.release.yml +++ b/pipelines/azure-pipelines.release.yml @@ -152,6 +152,14 @@ extends: displayName: Configure internal feed workingDirectory: $(Build.SourcesDirectory) + - task: UseDotNet@2 + displayName: Use .NET SDK from global.json + inputs: + packageType: sdk + useGlobalJson: true + workingDirectory: $(Build.SourcesDirectory) + performMultiLevelLookup: true + - task: DotNetCoreCLI@2 displayName: Restore inputs: diff --git a/pipelines/azure-pipelines.yml b/pipelines/azure-pipelines.yml index bb6bd1f6..624748a0 100644 --- a/pipelines/azure-pipelines.yml +++ b/pipelines/azure-pipelines.yml @@ -109,6 +109,14 @@ extends: $manifest.Package.Identity.Version = "$(version)" $manifest.save("$(workingDirectory)/WingetCreatePackage/Package.appxmanifest") + - task: UseDotNet@2 + displayName: Use .NET SDK from global.json + inputs: + packageType: sdk + useGlobalJson: true + workingDirectory: $(Build.SourcesDirectory) + performMultiLevelLookup: true + - task: DotNetCoreCLI@2 displayName: Restore inputs: From 382898449c9284f12e275b8d1c1c6a7fda922512 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Wed, 20 May 2026 16:43:02 -0700 Subject: [PATCH 08/16] Update to .net9 --- pipelines/azure-pipelines.yml | 2 +- .../PublishProfiles/x64ReleasePublishProfile.pubxml | 6 +++--- .../PublishProfiles/x86ReleasePublishProfile.pubxml | 6 +++--- src/WingetCreateCLI/WingetCreateCLI.csproj | 2 +- src/WingetCreateCore/WingetCreateCore.csproj | 2 +- .../WingetCreateTests/WingetCreateTests.csproj | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pipelines/azure-pipelines.yml b/pipelines/azure-pipelines.yml index 624748a0..2109e532 100644 --- a/pipelines/azure-pipelines.yml +++ b/pipelines/azure-pipelines.yml @@ -34,7 +34,7 @@ variables: buildPlatform: "x64" # Target framework - targetFramework: "net8.0-windows10.0.26100.0" + targetFramework: "net9.0-windows10.0.26100.0" resources: repositories: diff --git a/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml b/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml index 7d34937b..d8a147d7 100644 --- a/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml +++ b/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml @@ -6,13 +6,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release x64 - bin\x64\Release\net8.0-windows10.0.26100.0\win-x64\publish\ + bin\x64\Release\net9.0-windows10.0.26100.0\win-x64\publish\ FileSystem - net8.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 win-x64 true False False False - \ No newline at end of file + diff --git a/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml b/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml index aa368948..d49f8cc7 100644 --- a/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml +++ b/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml @@ -6,13 +6,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release x86 - bin\x86\Release\net8.0-windows10.0.26100.0\win-x86\publish\ + bin\x86\Release\net9.0-windows10.0.26100.0\win-x86\publish\ FileSystem - net8.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 win-x86 true False False False - \ No newline at end of file + diff --git a/src/WingetCreateCLI/WingetCreateCLI.csproj b/src/WingetCreateCLI/WingetCreateCLI.csproj index 5342ead4..f44f9993 100644 --- a/src/WingetCreateCLI/WingetCreateCLI.csproj +++ b/src/WingetCreateCLI/WingetCreateCLI.csproj @@ -2,7 +2,7 @@ Exe - net8.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 WingetCreateCLI Microsoft.WingetCreateCLI 1.12 diff --git a/src/WingetCreateCore/WingetCreateCore.csproj b/src/WingetCreateCore/WingetCreateCore.csproj index 48d4154d..4e0a6844 100644 --- a/src/WingetCreateCore/WingetCreateCore.csproj +++ b/src/WingetCreateCore/WingetCreateCore.csproj @@ -4,7 +4,7 @@ true true Microsoft.WingetCreateCore - net8.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 x86;x64 win-x86;win-x64 true diff --git a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj index 9a5803aa..8b49b3f3 100644 --- a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj +++ b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj @@ -1,7 +1,7 @@  - net8.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 false true x64;x86 From 8ae9ab5904d25b5f6a418b8e2a229b1f2547ec1e Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Thu, 21 May 2026 12:40:22 -0700 Subject: [PATCH 09/16] Addressed comments --- Directory.Packages.props | 1 + global.json | 6 ++++++ pipelines/azure-pipelines.yml | 2 +- .../PublishProfiles/x64ReleasePublishProfile.pubxml | 4 ++-- .../PublishProfiles/x86ReleasePublishProfile.pubxml | 4 ++-- src/WingetCreateCLI/WingetCreateCLI.csproj | 6 +----- src/WingetCreateCore/WingetCreateCore.csproj | 7 +++++-- .../WingetCreateTests/WingetCreateTests.csproj | 2 +- 8 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 global.json diff --git a/Directory.Packages.props b/Directory.Packages.props index 779d54f3..77bb574b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,6 +1,7 @@ true + true diff --git a/global.json b/global.json new file mode 100644 index 00000000..9eeb4288 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "10.0.101", + "rollForward": "latestFeature" + } +} diff --git a/pipelines/azure-pipelines.yml b/pipelines/azure-pipelines.yml index 2109e532..02ca4d1c 100644 --- a/pipelines/azure-pipelines.yml +++ b/pipelines/azure-pipelines.yml @@ -34,7 +34,7 @@ variables: buildPlatform: "x64" # Target framework - targetFramework: "net9.0-windows10.0.26100.0" + targetFramework: "net10.0-windows10.0.26100.0" resources: repositories: diff --git a/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml b/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml index d8a147d7..2945cb6e 100644 --- a/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml +++ b/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release x64 - bin\x64\Release\net9.0-windows10.0.26100.0\win-x64\publish\ + bin\x64\Release\net10.0-windows10.0.26100.0\win-x64\publish\ FileSystem - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 win-x64 true False diff --git a/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml b/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml index d49f8cc7..bf244c04 100644 --- a/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml +++ b/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release x86 - bin\x86\Release\net9.0-windows10.0.26100.0\win-x86\publish\ + bin\x86\Release\net10.0-windows10.0.26100.0\win-x86\publish\ FileSystem - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 win-x86 true False diff --git a/src/WingetCreateCLI/WingetCreateCLI.csproj b/src/WingetCreateCLI/WingetCreateCLI.csproj index f44f9993..c6c14524 100644 --- a/src/WingetCreateCLI/WingetCreateCLI.csproj +++ b/src/WingetCreateCLI/WingetCreateCLI.csproj @@ -2,7 +2,7 @@ Exe - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 WingetCreateCLI Microsoft.WingetCreateCLI 1.12 @@ -21,18 +21,14 @@ - all runtime; build; native; contentfiles; analyzers; buildtransitive - - all runtime; build; native; contentfiles; analyzers; buildtransitive - all diff --git a/src/WingetCreateCore/WingetCreateCore.csproj b/src/WingetCreateCore/WingetCreateCore.csproj index 4e0a6844..ff45a3d3 100644 --- a/src/WingetCreateCore/WingetCreateCore.csproj +++ b/src/WingetCreateCore/WingetCreateCore.csproj @@ -4,7 +4,7 @@ true true Microsoft.WingetCreateCore - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 x86;x64 win-x86;win-x64 true @@ -16,15 +16,18 @@ + - + + all runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj index 8b49b3f3..cb70ff75 100644 --- a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj +++ b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj @@ -1,7 +1,7 @@  - net9.0-windows10.0.26100.0 + net10.0-windows10.0.26100.0 false true x64;x86 From b9e9ba8975bc726dd02bb3d382442af30f7518f8 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Thu, 21 May 2026 13:49:01 -0700 Subject: [PATCH 10/16] Remove rollForward --- global.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/global.json b/global.json index 9eeb4288..936a420a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,5 @@ { "sdk": { - "version": "10.0.101", - "rollForward": "latestFeature" + "version": "10.0.101" } } From 9ad81ce5dca4825c6e526c3261186a232c4134b6 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Thu, 21 May 2026 14:02:18 -0700 Subject: [PATCH 11/16] Try 10.0.300 --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 936a420a..9769786b 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "10.0.101" + "version": "10.0.300" } } From eb7c78ddf331734d6806e0ef14a95152f025f477 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Thu, 21 May 2026 14:12:07 -0700 Subject: [PATCH 12/16] Revert "Try 10.0.300" This reverts commit 9ad81ce5dca4825c6e526c3261186a232c4134b6. --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 9769786b..936a420a 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "10.0.300" + "version": "10.0.101" } } From c08e0ccb5b52dc799679d272837bb1c9ef019ef1 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Thu, 21 May 2026 14:41:24 -0700 Subject: [PATCH 13/16] Update image --- pipelines/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipelines/azure-pipelines.yml b/pipelines/azure-pipelines.yml index 02ca4d1c..9d9e5395 100644 --- a/pipelines/azure-pipelines.yml +++ b/pipelines/azure-pipelines.yml @@ -48,7 +48,7 @@ extends: parameters: pool: name: Azure-Pipelines-1ESPT-ExDShared - image: windows-2022 + image: windows-2025-vs2026 os: windows customBuildTags: - ES365AIMigrationTooling From ddf477b2bc3b683f33be5f141a2ca570dca98542 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Thu, 21 May 2026 14:47:01 -0700 Subject: [PATCH 14/16] Revert and update vstest --- Directory.Packages.props | 2 +- pipelines/azure-pipelines.yml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 77bb574b..e7af164f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ - + diff --git a/pipelines/azure-pipelines.yml b/pipelines/azure-pipelines.yml index 9d9e5395..75dffb96 100644 --- a/pipelines/azure-pipelines.yml +++ b/pipelines/azure-pipelines.yml @@ -48,7 +48,7 @@ extends: parameters: pool: name: Azure-Pipelines-1ESPT-ExDShared - image: windows-2025-vs2026 + image: windows-2022 os: windows customBuildTags: - ES365AIMigrationTooling @@ -136,9 +136,16 @@ extends: /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxPackageSigningEnabled=false' + - task: VisualStudioTestPlatformInstaller@1 + displayName: Install latest VSTest platform + inputs: + packageFeedSelector: 'nugetOrg' + versionSelector: 'latestStable' + - task: VSTest@2 displayName: Run Tests inputs: + vsTestVersion: 'toolsInstaller' testSelector: "testAssemblies" testAssemblyVer2: 'src\WingetCreateTests\WingetCreateTests\bin\$(buildPlatform)\$(buildConfiguration)\$(targetFramework)\WingetCreateTests.dll' runSettingsFile: 'src\WingetCreateTests\WingetCreateTests\Test.runsettings' From 3942bbff458f9ea487e8fe7206f6633e4f6b29c0 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Thu, 21 May 2026 17:08:06 -0700 Subject: [PATCH 15/16] Revert back to net9 --- Directory.Packages.props | 2 +- global.json | 2 +- pipelines/azure-pipelines.yml | 9 +-------- .../PublishProfiles/x64ReleasePublishProfile.pubxml | 4 ++-- .../PublishProfiles/x86ReleasePublishProfile.pubxml | 4 ++-- src/WingetCreateCLI/WingetCreateCLI.csproj | 2 +- src/WingetCreateCore/WingetCreateCore.csproj | 2 +- .../WingetCreateTests/WingetCreateTests.csproj | 2 +- 8 files changed, 10 insertions(+), 17 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e7af164f..77bb574b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ - + diff --git a/global.json b/global.json index 936a420a..135a2663 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "10.0.101" + "version": "9.0.313" } } diff --git a/pipelines/azure-pipelines.yml b/pipelines/azure-pipelines.yml index 75dffb96..2109e532 100644 --- a/pipelines/azure-pipelines.yml +++ b/pipelines/azure-pipelines.yml @@ -34,7 +34,7 @@ variables: buildPlatform: "x64" # Target framework - targetFramework: "net10.0-windows10.0.26100.0" + targetFramework: "net9.0-windows10.0.26100.0" resources: repositories: @@ -136,16 +136,9 @@ extends: /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxPackageSigningEnabled=false' - - task: VisualStudioTestPlatformInstaller@1 - displayName: Install latest VSTest platform - inputs: - packageFeedSelector: 'nugetOrg' - versionSelector: 'latestStable' - - task: VSTest@2 displayName: Run Tests inputs: - vsTestVersion: 'toolsInstaller' testSelector: "testAssemblies" testAssemblyVer2: 'src\WingetCreateTests\WingetCreateTests\bin\$(buildPlatform)\$(buildConfiguration)\$(targetFramework)\WingetCreateTests.dll' runSettingsFile: 'src\WingetCreateTests\WingetCreateTests\Test.runsettings' diff --git a/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml b/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml index 2945cb6e..d8a147d7 100644 --- a/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml +++ b/src/WingetCreateCLI/Properties/PublishProfiles/x64ReleasePublishProfile.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release x64 - bin\x64\Release\net10.0-windows10.0.26100.0\win-x64\publish\ + bin\x64\Release\net9.0-windows10.0.26100.0\win-x64\publish\ FileSystem - net10.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 win-x64 true False diff --git a/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml b/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml index bf244c04..09158f1e 100644 --- a/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml +++ b/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release x86 - bin\x86\Release\net10.0-windows10.0.26100.0\win-x86\publish\ + bin\x86\Release\ net9.0-windows10.0.26100.0\win-x86\publish\ FileSystem - net10.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 win-x86 true False diff --git a/src/WingetCreateCLI/WingetCreateCLI.csproj b/src/WingetCreateCLI/WingetCreateCLI.csproj index c6c14524..93cd08f6 100644 --- a/src/WingetCreateCLI/WingetCreateCLI.csproj +++ b/src/WingetCreateCLI/WingetCreateCLI.csproj @@ -2,7 +2,7 @@ Exe - net10.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 WingetCreateCLI Microsoft.WingetCreateCLI 1.12 diff --git a/src/WingetCreateCore/WingetCreateCore.csproj b/src/WingetCreateCore/WingetCreateCore.csproj index ff45a3d3..8687e17e 100644 --- a/src/WingetCreateCore/WingetCreateCore.csproj +++ b/src/WingetCreateCore/WingetCreateCore.csproj @@ -4,7 +4,7 @@ true true Microsoft.WingetCreateCore - net10.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 x86;x64 win-x86;win-x64 true diff --git a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj index cb70ff75..8b49b3f3 100644 --- a/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj +++ b/src/WingetCreateTests/WingetCreateTests/WingetCreateTests.csproj @@ -1,7 +1,7 @@  - net10.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 false true x64;x86 From ad76d1e740500c47b8f2c11faf8a53308e6d15a0 Mon Sep 17 00:00:00 2001 From: AmirMS <104940545+AmelBawa-msft@users.noreply.github.com> Date: Thu, 21 May 2026 17:20:00 -0700 Subject: [PATCH 16/16] Update src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Flor Chacón <14323496+florelis@users.noreply.github.com> --- .../Properties/PublishProfiles/x86ReleasePublishProfile.pubxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml b/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml index 09158f1e..b3d2656b 100644 --- a/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml +++ b/src/WingetCreateCLI/Properties/PublishProfiles/x86ReleasePublishProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release x86 - bin\x86\Release\ net9.0-windows10.0.26100.0\win-x86\publish\ + bin\x86\Release\net9.0-windows10.0.26100.0\win-x86\publish\ FileSystem net9.0-windows10.0.26100.0 win-x86