Merge branch 'master' into fontinstall

Author: dkbennett

.github/actions/spelling/allow.txt

@@ -53,6 +53,7 @@ createpintable
 createportabletable
 createtables
 CRTDECL
+CRYPTPROTECT
 CTLs
 curated
 CURSORPOSITON
@@ -63,6 +64,7 @@ datetime
 dbconn
 DBId
 debugbreak
+dedup
 defaultlocale
 delstore
 Demitrius
@@ -113,6 +115,7 @@ FLUSHEACHLINE
 fnt
 forcerestart
 gdi
+genai
 HCCE
 hcertstore
 HCRYPTMSG
@@ -228,6 +231,7 @@ Pathto
 PBYTE
 pch
 PCWSTR
+pelikhan
 PEVENT
 pfns
 pfp

.github/actions/spelling/expect.txt

@@ -18,6 +18,7 @@ AMap
 Amd
 amrutha
 ansistring
+anyissuer
 Aot
 APARTMENTTHREADED
 apfn
@@ -106,6 +107,7 @@ countryregion
 Cov
 CPIL
 createmanifestmetadata
+crt
 cswinrt
 ctc
 CTL
@@ -167,6 +169,7 @@ FECAFEB
 fedorapeople
 fileinuse
 filemode
+Filetime
 Filtercriteria
 Finalizers
 fintimes
@@ -458,6 +461,7 @@ removefile
 reparse
 repeatedkey
 REQS
+requirenonleaf
 restsource
 RGBQUAD
 rgp
@@ -544,6 +548,7 @@ thiscouldbeapc
 threehundred
 timespan
 Tlg
+TLSCAs
 tombstoned
 transitioning
 trimstart
@@ -588,6 +593,7 @@ vns
 vsconfig
 vstest
 waitable
+wal
 wcex
 WDAG
 webpages

.github/workflows/automatic-issue-deduplication.yml

@@ -0,0 +1,19 @@
+name: Automatic New Issue Deduplication
+on:
+  issues:
+    types: [opened, reopened]
+permissions:
+  models: read
+  issues: write
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.issue.number }}
+  cancel-in-progress: true
+jobs:
+  deduplicate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Deduplicate Action
+        uses: pelikhan/action-genai-issue-dedup@v0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          label_as_duplicate: true

azure-pipelines.yml

@@ -332,7 +332,7 @@ jobs:
   - powershell: |
       Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
       Install-Module Microsoft.WinGet.Client -Repository PSGallery -Force
-      Repair-WingetPackageManager -AllUsers -Latest
+      try { Repair-WingetPackageManager -AllUsers -Latest -Verbose } catch { $_.Exception }
       Install-WinGetPackage -Id Microsoft.Sysinternals.PsTools -Source winget
     displayName: Install Sysinternals PsTools Using Winget
     condition: succeededOrFailed()

doc/admx/en-US/DesktopAppInstaller.adml

@@ -116,7 +116,7 @@ If you disable this setting, users will not be able to use the Windows Package M
         If you enable this setting, users will be able to configure the Windows Package Manager's use of proxy through the command line.
 
         If you disable or do not configure this setting, users will not be able to to configure the Windows Package Manager's use of proxy through the command line.</string>
-      <string id="EnableWindowsPackageManagerMcpServer">Enable Windows Package Manager MCP Server</string>
+      <string id="EnableWindowsPackageManagerMcpServer">Enable MCP Server for Windows Package Manager</string>
       <string id="EnableWindowsPackageManagerMcpServerExplanation">
         This policy controls whether the Windows Package Manager Model Context Protocol (MCP) server can be used.
 
@@ -169,3 +169,4 @@ If you disable, Microsoft SmartScreen will not be consulted before installing a
     </presentationTable>
   </resources>
 </policyDefinitionResources>
+

src/AppInstallerCLI.sln

@@ -37,6 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{8D53
 		..\azure-pipelines.nuget.yml = ..\azure-pipelines.nuget.yml
 		..\azure-pipelines.yml = ..\azure-pipelines.yml
 		..\cgmanifest.json = ..\cgmanifest.json
+		Directory.Build.props = Directory.Build.props
 		..\README.md = ..\README.md
 		..\doc\ReleaseNotes.md = ..\doc\ReleaseNotes.md
 		..\doc\Settings.md = ..\doc\Settings.md

src/AppInstallerCLICore/AppInstallerCLICore.vcxproj

@@ -279,21 +279,6 @@
       <SubSystem Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(UseProdCLSIDs)' == 'true'">
-    <ClCompile>
-      <PreprocessorDefinitions>USE_PROD_CLSIDS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(WingetDisableTestHooks)'=='true'">
-    <ClCompile>
-      <PreprocessorDefinitions>AICLI_DISABLE_TEST_HOOKS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(WingetDisableExperimentalFeatures)'=='true'">
-    <ClCompile>
-      <PreprocessorDefinitions>WINGET_DISABLE_EXPERIMENTAL_FEATURES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="Argument.h" />
     <ClInclude Include="ChannelStreams.h" />

src/AppInstallerCLICore/PortableInstaller.cpp

@@ -281,7 +281,7 @@ namespace AppInstaller::CLI::Portable
         return true;
     }
 
-    void PortableInstaller::Install( Workflow::OperationType operation = Workflow::OperationType::Install)
+    void PortableInstaller::Install(Workflow::OperationType operation)
     {
         // If the operation is an install, the ARP entry should be created first so that a catastrophic failure
         // leaves the system in a state where an uninstall may be possible
@@ -420,6 +420,19 @@ namespace AppInstaller::CLI::Portable
         HelpLink = manifest.CurrentLocalization.Get<Manifest::Localization::PublisherSupportUrl>();
     }
 
+    AppInstaller::Manifest::AppsAndFeaturesEntry PortableInstaller::GetAppsAndFeaturesEntry()
+    {
+        Manifest::AppsAndFeaturesEntry entry;
+
+        entry.DisplayName = DisplayName;
+        entry.Publisher = Publisher;
+        entry.DisplayVersion = DisplayVersion;
+        entry.InstallerType = Manifest::InstallerTypeEnum::Portable;
+        entry.ProductCode = GetProductCode();
+
+        return entry;
+    }
+
     void PortableInstaller::SetExpectedState()
     {
         const auto& indexPath = InstallLocation / GetPortableIndexFileName();

src/AppInstallerCLICore/PortableInstaller.h

@@ -59,7 +59,7 @@ namespace AppInstaller::CLI::Portable
             m_desiredEntries = {};
         }
 
-        void Install( AppInstaller::CLI::Workflow::OperationType operation );
+        void Install(AppInstaller::CLI::Workflow::OperationType operation = Workflow::OperationType::Install);
 
         void Uninstall();
 
@@ -91,6 +91,8 @@ namespace AppInstaller::CLI::Portable
             const Manifest::Manifest& manifest,
             const std::vector<AppInstaller::Manifest::AppsAndFeaturesEntry>& entries);
 
+        AppInstaller::Manifest::AppsAndFeaturesEntry GetAppsAndFeaturesEntry();
+
     private:
         PortableARPEntry m_portableARPEntry;
         std::vector<AppInstaller::Portable::PortableFileEntry> m_desiredEntries;

src/AppInstallerCLICore/Workflows/PortableFlow.cpp

@@ -167,7 +167,7 @@ namespace AppInstaller::CLI::Workflow
         }
 
         portableInstaller.TargetInstallLocation = targetInstallDirectory;
-        portableInstaller.SetAppsAndFeaturesMetadata(context.Get<Execution::Data::Manifest>(), context.Get<Execution::Data::Installer>()->AppsAndFeaturesEntries);
+        portableInstaller.SetAppsAndFeaturesMetadata(context.Get<Execution::Data::Manifest>(), installer.AppsAndFeaturesEntries);
         context.Add<Execution::Data::PortableInstaller>(std::move(portableInstaller));
     }
 
@@ -273,7 +273,8 @@ namespace AppInstaller::CLI::Workflow
                 }
             }
 
-            portableInstaller.Install(installType);
+            portableInstaller.Install(installType);
+            context.Add<Execution::Data::CorrelatedAppsAndFeaturesEntries>({ portableInstaller.GetAppsAndFeaturesEntry() });
             context.Add<Execution::Data::OperationReturnCode>(ERROR_SUCCESS);
             context.Reporter.Warn() << portableInstaller.GetOutputMessage();
         }