Skip to content

Commit 2824cd6

Browse files
JohnMcPMSJohnMcPMS
committed
Merge from master
2 parents 2ffe6f4 + e000353 commit 2824cd6

File tree

69 files changed

+1286
-90
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1286
-90
lines changed

‎.github/actions/spelling/allow.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ MAKEINTRESOURCE
167167
makemsix
168168
MANIFESTSCHEMA
169169
MANIFESTVERSION
170+
mcp
170171
Memberwise
171172
meme
172173
metadatas

‎.github/actions/spelling/excludes.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,5 @@
104104
^src/SfsClient/
105105
^src/Xlang/
106106
^src/VcpkgPortOverlay/
107+
^src/WinGetMCPServer/WinGetMCPServer.csproj$
107108
ignore$

‎.github/actions/spelling/expect.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ awgs
4747
azurewebsites
4848
Baz
4949
bcp
50+
BEBOM
5051
BEFACEF
5152
bfd
5253
BFirst
@@ -268,6 +269,7 @@ kool
268269
ktf
269270
LCID
270271
learnxinyminutes
272+
LEBOM
271273
lhs
272274
LIBYAML
273275
liv

‎doc/ReleaseNotes.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## New in v1.12
2-
*No applicable update found*
2+
MCP server available; run `winget mcp` for assistance on configuring your client.
3+
4+
## Bug Fixes
5+
* Manifest validation no longer fails using `UTF-8 BOM` encoding when the schema header is on the first line
36

47
## Experimental Features
58
* Experimental support for Fonts

‎doc/admx/DesktopAppInstaller.admx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,16 @@
176176
<decimal value="0" />
177177
</disabledValue>
178178
</policy>
179+
<policy name="EnableWindowsPackageManagerMcpServer" class="Machine" displayName="$(string.EnableWindowsPackageManagerMcpServer)" explainText="$(string.EnableWindowsPackageManagerMcpServerExplanation)" key="Software\Policies\Microsoft\Windows\AppInstaller" valueName="EnableWindowsPackageManagerMcpServer">
180+
<parentCategory ref="AppInstaller" />
181+
<supportedOn ref="windows:SUPPORTED_Windows_10_0_RS5" />
182+
<enabledValue>
183+
<decimal value="1" />
184+
</enabledValue>
185+
<disabledValue>
186+
<decimal value="0" />
187+
</disabledValue>
188+
</policy>
179189
<policy name="WindowsPackageManagerDefaultProxy" class="Machine" displayName="$(string.WindowsPackageManagerDefaultProxy)" explainText="$(string.WindowsPackageManagerDefaultProxyExplanation)" presentation="$(presentation.WindowsPackageManagerDefaultProxy)" key="Software\Policies\Microsoft\Windows\AppInstaller">
180190
<parentCategory ref="AppInstaller" />
181191
<supportedOn ref="windows:SUPPORTED_Windows_10_0_RS5" />

‎doc/admx/en-US/DesktopAppInstaller.adml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,13 @@ If you disable this setting, users will not be able to use the Windows Package M
116116
If you enable this setting, users will be able to configure the Windows Package Manager's use of proxy through the command line.
117117

118118
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>
119+
<string id="EnableWindowsPackageManagerMcpServer">Enable Windows Package Manager MCP Server</string>
120+
<string id="EnableWindowsPackageManagerMcpServerExplanation">
121+
This policy controls whether the Windows Package Manager Model Context Protocol (MCP) server can be used.
122+
123+
If you enable or do not configure this setting, users will be able to use the Windows Package Manager's MCP server.
124+
125+
If you disable this setting, users will not be able to to use the Windows Package Manager's MCP server.</string>
119126
<string id="WindowsPackageManagerDefaultProxy">Set Windows Package Manager Default Proxy</string>
120127
<string id="WindowsPackageManagerDefaultProxyExplanation">This policy controls the default proxy used by the Windows Package Manager.
121128

‎src/AppInstallerCLI.sln‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinGetTestCommon", "WinGetT
213213
EndProject
214214
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
215215
EndProject
216+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinGetMCPServer", "WinGetMCPServer\WinGetMCPServer.csproj", "{33745E4A-39E2-676F-7E23-50FB43848D25}"
217+
EndProject
216218
Global
217219
GlobalSection(SolutionConfigurationPlatforms) = preSolution
218220
Debug|ARM64 = Debug|ARM64
@@ -994,6 +996,27 @@ Global
994996
{7139ED6E-8FBC-0B61-3E3A-AA2A23CC4D6A}.ReleaseStatic|x64.Build.0 = Release|x64
995997
{7139ED6E-8FBC-0B61-3E3A-AA2A23CC4D6A}.ReleaseStatic|x86.ActiveCfg = Release|x86
996998
{7139ED6E-8FBC-0B61-3E3A-AA2A23CC4D6A}.ReleaseStatic|x86.Build.0 = Release|x86
999+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Debug|ARM64.ActiveCfg = Debug|arm64
1000+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Debug|ARM64.Build.0 = Debug|arm64
1001+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Debug|x64.ActiveCfg = Debug|x64
1002+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Debug|x64.Build.0 = Debug|x64
1003+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Debug|x86.ActiveCfg = Debug|x86
1004+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Debug|x86.Build.0 = Debug|x86
1005+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Fuzzing|ARM64.ActiveCfg = Release|arm64
1006+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Fuzzing|x64.ActiveCfg = Release|x64
1007+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Fuzzing|x86.ActiveCfg = Release|x86
1008+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Release|ARM64.ActiveCfg = Release|arm64
1009+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Release|ARM64.Build.0 = Release|arm64
1010+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Release|x64.ActiveCfg = Release|x64
1011+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Release|x64.Build.0 = Release|x64
1012+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Release|x86.ActiveCfg = Release|x86
1013+
{33745E4A-39E2-676F-7E23-50FB43848D25}.Release|x86.Build.0 = Release|x86
1014+
{33745E4A-39E2-676F-7E23-50FB43848D25}.ReleaseStatic|ARM64.ActiveCfg = Release|arm64
1015+
{33745E4A-39E2-676F-7E23-50FB43848D25}.ReleaseStatic|ARM64.Build.0 = Release|arm64
1016+
{33745E4A-39E2-676F-7E23-50FB43848D25}.ReleaseStatic|x64.ActiveCfg = Release|x64
1017+
{33745E4A-39E2-676F-7E23-50FB43848D25}.ReleaseStatic|x64.Build.0 = Release|x64
1018+
{33745E4A-39E2-676F-7E23-50FB43848D25}.ReleaseStatic|x86.ActiveCfg = Release|x86
1019+
{33745E4A-39E2-676F-7E23-50FB43848D25}.ReleaseStatic|x86.Build.0 = Release|x86
9971020
EndGlobalSection
9981021
GlobalSection(SolutionProperties) = preSolution
9991022
HideSolutionNode = FALSE

‎src/AppInstallerCLICore/AppInstallerCLICore.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@
325325
<ClInclude Include="Commands\FeaturesCommand.h" />
326326
<ClInclude Include="Commands\HashCommand.h" />
327327
<ClInclude Include="Commands\ListCommand.h" />
328+
<ClInclude Include="Commands\McpCommand.h" />
328329
<ClInclude Include="Commands\PinCommand.h" />
329330
<ClInclude Include="Commands\RepairCommand.h" />
330331
<ClInclude Include="Commands\SearchCommand.h" />
@@ -410,6 +411,7 @@
410411
<ClCompile Include="Commands\ErrorCommand.cpp" />
411412
<ClCompile Include="Commands\FontCommand.cpp" />
412413
<ClCompile Include="Commands\ImportCommand.cpp" />
414+
<ClCompile Include="Commands\McpCommand.cpp" />
413415
<ClCompile Include="Commands\PinCommand.cpp" />
414416
<ClCompile Include="Commands\RepairCommand.cpp" />
415417
<ClCompile Include="Commands\TestCommand.cpp" />

‎src/AppInstallerCLICore/AppInstallerCLICore.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,9 @@
296296
<ClInclude Include="Public\ShutdownMonitoring.h">
297297
<Filter>Public</Filter>
298298
</ClInclude>
299+
<ClInclude Include="Commands\McpCommand.h">
300+
<Filter>Commands</Filter>
301+
</ClInclude>
299302
</ItemGroup>
300303
<ItemGroup>
301304
<ClCompile Include="pch.cpp">
@@ -559,6 +562,9 @@
559562
<ClCompile Include="ShutdownMonitoring.cpp">
560563
<Filter>Source Files</Filter>
561564
</ClCompile>
565+
<ClCompile Include="Commands\McpCommand.cpp">
566+
<Filter>Commands</Filter>
567+
</ClCompile>
562568
</ItemGroup>
563569
<ItemGroup>
564570
<None Include="PropertySheet.props" />

‎src/AppInstallerCLICore/Argument.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ namespace AppInstaller::CLI
211211
return { type, "accept-configuration-agreements"_liv };
212212
case Execution::Args::Type::ConfigurationSuppressPrologue:
213213
return { type, "suppress-initial-details"_liv };
214-
case Execution::Args::Type::ConfigurationEnable:
214+
case Execution::Args::Type::ExtendedFeaturesEnable:
215215
return { type, "enable"_liv, ArgTypeCategory::None, ArgTypeExclusiveSet::StubType };
216-
case Execution::Args::Type::ConfigurationDisable:
216+
case Execution::Args::Type::ExtendedFeaturesDisable:
217217
return { type, "disable"_liv, ArgTypeCategory::None, ArgTypeExclusiveSet::StubType };
218218
case Execution::Args::Type::ConfigurationModulePath:
219219
return { type, "module-path"_liv };

0 commit comments

Comments
 (0)