Skip to content

Resolve nuget package graph for .NET projects together #5627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnMcPMS merged 2 commits into from
Jul 29, 2025
Merged

Resolve nuget package graph for .NET projects together #5627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
766e090
Move MCP server to be referenced so we get singular package resolution
JohnMcPMS Jul 29, 2025
56ca92d
Rename directory to reflect expanded contents
JohnMcPMS Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/AppInstallerCLICore/ConfigurationSetProcessorFactoryRemoting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 3 additions & 6 deletions src/AppInstallerCLIPackage/AppInstallerCLIPackage.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@
<Target Name="WinGetIncludeAdditionalFilesInPackage" AfterTargets="_ComputeAppxPackagePayload">
<PropertyGroup>
<WinGetAdditionalPackageFileRoot>$(SolutionDir)</WinGetAdditionalPackageFileRoot>
<WinGetDotNetDirectoryName>DotNet</WinGetDotNetDirectoryName>
</PropertyGroup>
<Message Importance="normal" Text="WinGetAdditionalPackageFileRoot = $(WinGetAdditionalPackageFileRoot)" />
<ItemGroup>
Expand All @@ -243,15 +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>
<Recurse>true</Recurse>
</WinGetAdditionalPackageFile>
<WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\WinGetMCPServer\net8.0-windows10.0.26100.0\$(ConfigServerRid)\**\*">
<PackagePath>WinGetMCPServer</PackagePath>
<PackagePath>$(WinGetDotNetDirectoryName)</PackagePath>
<Recurse>true</Recurse>
</WinGetAdditionalPackageFile>
<WinGetAdditionalPackageFile Include="$(WinGetAdditionalPackageFileRoot)\$(PlatformTarget)\$(Configuration)\Microsoft.Management.Deployment.OutOfProc\Microsoft.Management.Deployment.OutOfProc.dll">
<PackagePath>WinGetMCPServer\Microsoft.Management.Deployment.dll</PackagePath>
<PackagePath>$(WinGetDotNetDirectoryName)\Microsoft.Management.Deployment.dll</PackagePath>
</WinGetAdditionalPackageFile>
<WinGetAdditionalPackageFile Include="$(SolutionDir)\PowerShell\ExternalModules\**\*">
<PackagePath>ExternalModules</PackagePath>
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCLIPackage/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
</com:Extension>
</Extensions>
</Application>
<Application Id="WinGetMCPServer" Executable="WinGetMCPServer\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 >
Expand Down
2 changes: 1 addition & 1 deletion src/AppInstallerCommonCore/SelfManagement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
2 changes: 2 additions & 0 deletions src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
<ItemGroup>
<ProjectReference Include="..\Microsoft.Management.Configuration.Processor\Microsoft.Management.Configuration.Processor.csproj" />
<ProjectReference Include="..\Microsoft.Management.Configuration\Microsoft.Management.Configuration.vcxproj" />
<!-- Pull in any other .NET projects that need to ship with the package so that they can resolve the nuget graph together and land in the same output location. -->
<ProjectReference Include="..\WinGetMCPServer\WinGetMCPServer.csproj" />
</ItemGroup>

<Target Name="PwshFiles" AfterTargets="AfterBuild">
Expand Down
9 changes: 8 additions & 1 deletion src/targets/ReferenceEmbeddedCsWinRTProject.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!--Do not publish projection source winmd files, but do include implementation dlls -->
<ReferenceCopyLocalPaths Remove="@(WinGetRemovedReferences)" />
<ReferenceCopyLocalPaths Include="@(WinGetRemovedReferences->'%(RootDir)%(Directory)%(DestinationSubDirectory)%(Implementation)')"
Condition="'%(WinGetRemovedReferences.Implementation)' != '' AND Exists('%(WinGetRemovedReferences.RootDir)%(WinGetRemovedReferences.Directory)%(WinGetRemovedReferences.DestinationSubDirectory)%(WinGetRemovedReferences.Implementation)')" />
Condition="'%(WinGetRemovedReferences.Implementation)' != '' AND '$([System.IO.Path]::GetExtension(%(WinGetRemovedReferences.Implementation)))' == '.dll' AND Exists('%(WinGetRemovedReferences.RootDir)%(WinGetRemovedReferences.Directory)%(WinGetRemovedReferences.DestinationSubDirectory)%(WinGetRemovedReferences.Implementation)')" />
<!--Remove winmd references from deps.json to prevent CLR failing unit test execution-->
<ReferenceDependencyPaths Remove="@(ReferenceDependencyPaths)" Condition="%(ReferenceDependencyPaths.Extension) == '.winmd'"/>
</ItemGroup>
Expand All @@ -36,4 +36,11 @@
<ResolvedCompileFileDefinitions Remove="@(ResolvedCompileFileDefinitions)" Condition="'$([System.IO.Path]::GetFileName(%(HintPath)))' == 'WinRT.Runtime.dll'"/>
</ItemGroup>
</Target>

<!-- Remove any items from ReferenceCopyLocalPaths that have CopyLocal set to false. -->
<Target Name="WinGetRemoveCopyLocalReferencesAsNeeded" AfterTargets="WinGetRemoveWinMDReferences">
<ItemGroup>
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="%(ReferenceCopyLocalPaths.CopyLocal) == 'false'" />
</ItemGroup>
</Target>
</Project>