winget-cli

commit 65ed18d4f2117902da49d31d7971a9d077921d36
parent 076b1b7e18c4eba8215428129148b4c032ed249b
Author: KEINOS <github+fork-qiita-news@keinos.com>
Date:   Tue, 10 Jun 2025 18:38:08 +0000

Merge remote-tracking branch 'upstream/master'

Diffstat:
M
src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp
 | 
10
+++++-----
M
src/CertificateResources/StoreIntermediate2.cer
 | 
0

M
src/CertificateResources/StoreLeaf1.cer
 | 
0

M
src/CertificateResources/StoreLeaf2.cer
 | 
0

M
src/Microsoft.Management.Configuration.Processor/DSCv3/Helpers/ProcessorSettings.cs
 | 
4
++--

5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp b/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp
@@ -203,12 +203,12 @@ namespace AppInstaller::CLI::Workflow
                         auto previousThreadGlobals = installDscContext.SetForCurrentThread();
 
                         Manifest::ManifestInstaller dscInstaller;
-// TEMP: Until DSCv3 support is not experimental, allow the preview build to be installed automatically.
-// #ifndef AICLI_DISABLE_TEST_HOOKS
+
+#ifndef AICLI_DISABLE_TEST_HOOKS
                         dscInstaller.ProductId = "9PCX3HX4HZ0Z";
-// #else
-//                      dscInstaller.ProductId = "9NVTPZWRC6KQ";
-// #endif
+#else
+                        dscInstaller.ProductId = "9NVTPZWRC6KQ";
+#endif
                         installDscContext.Add<Execution::Data::Installer>(std::move(dscInstaller));
                         installDscContext.Args.AddArg(Execution::Args::Type::InstallScope, Manifest::ScopeToString(Manifest::ScopeEnum::User));
                         installDscContext.Args.AddArg(Execution::Args::Type::Silent);
diff --git a/src/CertificateResources/StoreIntermediate2.cer b/src/CertificateResources/StoreIntermediate2.cer
Binary files differ.
diff --git a/src/CertificateResources/StoreLeaf1.cer b/src/CertificateResources/StoreLeaf1.cer
Binary files differ.
diff --git a/src/CertificateResources/StoreLeaf2.cer b/src/CertificateResources/StoreLeaf2.cer
Binary files differ.
diff --git a/src/Microsoft.Management.Configuration.Processor/DSCv3/Helpers/ProcessorSettings.cs b/src/Microsoft.Management.Configuration.Processor/DSCv3/Helpers/ProcessorSettings.cs
@@ -121,13 +121,13 @@ namespace Microsoft.Management.Configuration.Processor.DSCv3.Helpers
             // To start, only attempt to find the package and launch it via app execution alias.
             // In the future, consider discovering it through %PATH% searching, but probably don't allow that from an elevated process.
             // That probably means creating another read property for finding the secure path.
-            // TEMP: Until DSCv3 support is not experimental, allow the preview build to be found automatically.
-// #if !AICLI_DISABLE_TEST_HOOKS
+#if !AICLI_DISABLE_TEST_HOOKS
             string? result = GetDscExecutablePathForPackage("Microsoft.DesiredStateConfiguration-Preview_8wekyb3d8bbwe");
             if (result != null)
             {
                 return result;
             }
+#endif
 
             return GetDscExecutablePathForPackage("Microsoft.DesiredStateConfiguration_8wekyb3d8bbwe");
         }