Rename directory to reflect expanded contents

Author: JohnMcPMS

src/AppInstallerCLICore/ConfigurationSetProcessorFactoryRemoting.cpp

@@ -20,7 +20,7 @@ namespace AppInstaller::CLI::ConfigurationRemoting
     namespace
     {
         // The executable file name for the remote server process.
-        constexpr std::wstring_view s_RemoteServerFileName = L"ConfigurationRemotingServer\\ConfigurationRemotingServer.exe"sv;
+        constexpr std::wstring_view s_RemoteServerFileName = L"DotNet\\ConfigurationRemotingServer.exe"sv;
 
         constexpr std::wstring_view s_ProcessorEngine_PowerShell = L"pwsh"sv;
         constexpr std::wstring_view s_ProcessorEngine_DSCv3 = L"dscv3"sv;

src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj

@@ -227,6 +227,7 @@
   <Target Name="WinGetIncludeAdditionalFilesInPackage" AfterTargets="_ComputeAppxPackagePayload">
     <PropertyGroup>
       <WinGetAdditionalPackageFileRoot>$(SolutionDir)</WinGetAdditionalPackageFileRoot>
+      <WinGetDotNetDirectoryName>DotNet</WinGetDotNetDirectoryName>
     </PropertyGroup>
     <Message Importance="normal" Text="WinGetAdditionalPackageFileRoot = $(WinGetAdditionalPackageFileRoot)" />
     <ItemGroup>
@@ -243,11 +244,11 @@
         <PackagePath>Microsoft.Management.Configuration.winmd</PackagePath>
       </WinGetAdditionalPackageFile>
       <WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\ConfigurationRemotingServer\net8.0-windows10.0.26100.0\$(ConfigServerRid)\**\*">
-        <PackagePath>ConfigurationRemotingServer</PackagePath>
+        <PackagePath>$(WinGetDotNetDirectoryName)</PackagePath>
         <Recurse>true</Recurse>
       </WinGetAdditionalPackageFile>
       <WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\Microsoft.Management.Deployment.OutOfProc\Microsoft.Management.Deployment.OutOfProc.dll">
-        <PackagePath>ConfigurationRemotingServer\Microsoft.Management.Deployment.dll</PackagePath>
+        <PackagePath>$(WinGetDotNetDirectoryName)\Microsoft.Management.Deployment.dll</PackagePath>
       </WinGetAdditionalPackageFile>
       <WinGetAdditionalPackageFile Include="$(SolutionDir)\PowerShell\ExternalModules\**\*">
         <PackagePath>ExternalModules</PackagePath>

src/AppInstallerCLIPackage/Package.appxmanifest

@@ -97,7 +97,7 @@
         </com:Extension>
       </Extensions>
     </Application>
-    <Application Id="WinGetMCPServer" Executable="ConfigurationRemotingServer\WinGetMCPServer.exe" EntryPoint="Windows.FullTrustApplication">
+    <Application Id="WinGetMCPServer" Executable="DotNet\WinGetMCPServer.exe" EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements DisplayName="WinGet Dev MCP Server" Square150x150Logo="Images\MedTile.png" Square44x44Logo="Images\AppList.png" Description="The WinGet MCP server." BackgroundColor="#0078d7" AppListEntry="none" >
         <uap:DefaultTile/>
       </uap:VisualElements >

src/AppInstallerCommonCore/SelfManagement.cpp

@@ -15,7 +15,7 @@ namespace AppInstaller::SelfManagement
 
     // Always use AppInstaller's package family name for wingetdev
     static constexpr std::wstring_view s_AppInstallerPfn = L"Microsoft.DesktopAppInstaller_8wekyb3d8bbwe"sv;
-    constexpr std::wstring_view s_RemoteServerFileName = L"ConfigurationRemotingServer\\ConfigurationRemotingServer.exe";
+    constexpr std::wstring_view s_RemoteServerFileName = L"DotNet\\ConfigurationRemotingServer.exe";
 
     bool IsStubPreferred()
     {