Configuration commands

.github/actions/spelling/allow.txt

@@ -446,6 +446,7 @@ REFCLSID
 REFCOUNT
 regex
 regexp
+remoting
 removefile
 removemanifest
 removepin

.github/actions/spelling/expect.txt

@@ -187,6 +187,7 @@ liv
 liwpx
 localizationpriority
 LPBYTE
+LPCWSTR
 LPDWORD
 lpitemidlist
 LPSTR
@@ -197,10 +198,12 @@ LTDA
 luffy
 Luffytaro
 malware
+mapview
 maxvalue
 maybenull
 MBH
 mdmp
+MDs
 megamorf
 midl
 minexample
@@ -320,6 +323,7 @@ SHCONTF
 SHGDN
 SHOWNORMAL
 sid
+Sideload
 SIGNATUREHASH
 Sku
 sortof
@@ -331,6 +335,7 @@ SRL
 srs
 standalone
 startswith
+STARTUPINFOW
 STRRET
 stylecop
 subdir

azure-pipelines.yml

@@ -106,7 +106,7 @@ jobs:
                     /p:AppxBundlePlatforms="$(buildPlatform)"
                     /p:AppxPackageDir="$(appxPackageDir)"
                     /p:AppxBundle=Always
-                    /p:UapAppxPackageBuildMode=StoreUpload'
+                    /p:UapAppxPackageBuildMode=SideloadOnly'
 
   - task: VSBuild@1
     displayName: Build Test Project
@@ -118,7 +118,7 @@ jobs:
                     /p:AppxBundlePlatforms="$(buildPlatform)"
                     /p:AppxPackageDir="$(appxPackageDir)"
                     /p:AppxBundle=Always
-                    /p:UapAppxPackageBuildMode=StoreUpload'
+                    /p:UapAppxPackageBuildMode=SideloadOnly'
 
   - task: CopyFiles@2
     displayName: 'Copy WindowsPackageManager.dll Symbols to artifacts folder'
@@ -317,6 +317,20 @@ jobs:
       TargetFolder: '$(artifactsDir)\PowerShell'
     condition: always()
 
+  - task: CopyFiles@2
+    displayName: 'Copy Dev Package (Loose Files)'
+    inputs:
+      SourceFolder: 'src\AppInstallerCLIPackage\bin\$(buildPlatform)\$(buildConfiguration)'
+      TargetFolder: '$(artifactsDir)\DevPackage'
+    condition: always()
+
+  - task: CopyFiles@2
+    displayName: 'Copy Dev Packages'
+    inputs:
+      SourceFolder: '$(appxPackageDir)'
+      TargetFolder: '$(artifactsDir)\AppxPackages'
+    condition: always()
+
   - task: PublishPipelineArtifact@1
     displayName: Publish Pipeline Artifacts
     inputs:

doc/Settings.md

@@ -263,3 +263,14 @@ You can enable the feature as shown below.
        "pinning": true
    },
 ```
+
+### configuration
+
+This feature enables the configuration commands. These commands allow configuring the system into a desired state.
+You can enable the feature as shown below.
+
+```json
+   "experimentalFeatures": {
+       "configuration": true
+   },
+```

schemas/JSON/settings/settings.schema.0.2.json

@@ -213,6 +213,11 @@
           "description": "Enable support for package pinning",
           "type": "boolean",
           "default": false
+        },
+        "configuration": {
+          "description": "Enable support for configuration",
+          "type": "boolean",
+          "default": false
         }
       }
     }

src/AppInstallerCLI.sln

@@ -7,6 +7,7 @@ Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "AppInstallerCLIPackage", "A
 		{1CC41A9A-AE66-459D-9210-1E572DD7BE69} = {1CC41A9A-AE66-459D-9210-1E572DD7BE69}
 		{2B00D362-AC92-41F3-A8D2-5B1599BDCA01} = {2B00D362-AC92-41F3-A8D2-5B1599BDCA01}
 		{5B6F90DF-FD19-4BAE-83D9-24DAD128E777} = {5B6F90DF-FD19-4BAE-83D9-24DAD128E777}
+		{CA460806-5E41-4E97-9A3D-1D74B433B663} = {CA460806-5E41-4E97-9A3D-1D74B433B663}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppInstallerCLI", "AppInstallerCLI\AppInstallerCLI.vcxproj", "{5B6F90DF-FD19-4BAE-83D9-24DAD128E777}"
@@ -157,6 +158,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Management.Config
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Management.Configuration.Processor", "Microsoft.Management.Configuration.Processor\Microsoft.Management.Configuration.Processor.csproj", "{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfigurationRemotingServer", "ConfigurationRemotingServer\ConfigurationRemotingServer.csproj", "{6597EB04-D105-49A7-A5A3-D27FE1DF895E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -846,6 +849,30 @@ Global
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|x64.Build.0 = Release|x64
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|x86.ActiveCfg = Release|x86
 		{71FA29AA-9035-468B-A11D-0F0B0F5D5AF4}.TestRelease|x86.Build.0 = Release|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|ARM64.ActiveCfg = Debug|arm64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|ARM64.Build.0 = Debug|arm64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|x64.ActiveCfg = Debug|x64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|x64.Build.0 = Debug|x64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|x86.ActiveCfg = Debug|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Debug|x86.Build.0 = Debug|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|ARM64.ActiveCfg = Debug|arm64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|ARM64.Build.0 = Debug|arm64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|x64.ActiveCfg = Debug|x64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|x64.Build.0 = Debug|x64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|x86.ActiveCfg = Debug|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Fuzzing|x86.Build.0 = Debug|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|ARM64.ActiveCfg = Release|arm64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|ARM64.Build.0 = Release|arm64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|x64.ActiveCfg = Release|x64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|x64.Build.0 = Release|x64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|x86.ActiveCfg = Release|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.Release|x86.Build.0 = Release|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|ARM64.ActiveCfg = Release|arm64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|ARM64.Build.0 = Release|arm64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|x64.ActiveCfg = Release|x64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|x64.Build.0 = Release|x64
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|x86.ActiveCfg = Release|x86
+		{6597EB04-D105-49A7-A5A3-D27FE1DF895E}.TestRelease|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/AppInstallerCLICore/AppInstallerCLICore.vcxproj

@@ -243,6 +243,10 @@
     <ClInclude Include="Command.h" />
     <ClInclude Include="Commands\COMCommand.h" />
     <ClInclude Include="Commands\CompleteCommand.h" />
+    <ClInclude Include="Commands\ConfigureCommand.h" />
+    <ClInclude Include="Commands\ConfigureShowCommand.h" />
+    <ClInclude Include="Commands\ConfigureTestCommand.h" />
+    <ClInclude Include="Commands\ConfigureValidateCommand.h" />
     <ClInclude Include="Commands\ExperimentalCommand.h" />
     <ClInclude Include="Commands\ExportCommand.h" />
     <ClInclude Include="Commands\ImportCommand.h" />
@@ -260,8 +264,11 @@
     <ClInclude Include="Commands\ValidateCommand.h" />
     <ClInclude Include="Commands\SettingsCommand.h" />
     <ClInclude Include="CompletionData.h" />
+    <ClInclude Include="ConfigurationContext.h" />
+    <ClInclude Include="ConfigurationSetProcessorFactoryRemoting.h" />
     <ClInclude Include="ContextOrchestrator.h" />
     <ClInclude Include="COMContext.h" />
+    <ClInclude Include="Workflows\ConfigurationFlow.h" />
     <ClInclude Include="Workflows\DependenciesFlow.h" />
     <ClInclude Include="ExecutionArgs.h" />
     <ClInclude Include="ExecutionContextData.h" />
@@ -301,9 +308,16 @@
   <ItemGroup>
     <ClCompile Include="COMContext.cpp" />
     <ClCompile Include="Commands\COMCommand.cpp" />
+    <ClCompile Include="Commands\ConfigureCommand.cpp" />
+    <ClCompile Include="Commands\ConfigureShowCommand.cpp" />
+    <ClCompile Include="Commands\ConfigureTestCommand.cpp" />
+    <ClCompile Include="Commands\ConfigureValidateCommand.cpp" />
     <ClCompile Include="Commands\ImportCommand.cpp" />
     <ClCompile Include="Commands\PinCommand.cpp" />
+    <ClCompile Include="ConfigurationContext.cpp" />
+    <ClCompile Include="ConfigurationSetProcessorFactoryRemoting.cpp" />
     <ClCompile Include="ContextOrchestrator.cpp" />
+    <ClCompile Include="Workflows\ConfigurationFlow.cpp" />
     <ClCompile Include="Workflows\DependenciesFlow.cpp" />
     <ClCompile Include="PackageCollection.cpp" />
     <ClCompile Include="Argument.cpp" />
@@ -367,6 +381,9 @@
     <ProjectReference Include="..\AppInstallerRepositoryCore\AppInstallerRepositoryCore.vcxproj">
       <Project>{5eb88068-5fb9-4e69-89b2-72dbc5e068f9}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Management.Configuration\Microsoft.Management.Configuration.vcxproj">
+      <Project>{ca460806-5e41-4e97-9a3d-1d74b433b663}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\YamlCppLib\YamlCppLib.vcxproj">
       <Project>{8bb94bb8-374f-4294-bca1-c7811514a6b7}</Project>
     </ProjectReference>

src/AppInstallerCLICore/AppInstallerCLICore.vcxproj.filters

@@ -197,6 +197,27 @@
     <ClInclude Include="Workflows\MultiQueryFlow.h">
       <Filter>Workflows</Filter>
     </ClInclude>
+    <ClInclude Include="Commands\ConfigureCommand.h">
+      <Filter>Commands</Filter>
+    </ClInclude>
+    <ClInclude Include="Commands\ConfigureShowCommand.h">
+      <Filter>Commands</Filter>
+    </ClInclude>
+    <ClInclude Include="Commands\ConfigureTestCommand.h">
+      <Filter>Commands</Filter>
+    </ClInclude>
+    <ClInclude Include="Commands\ConfigureValidateCommand.h">
+      <Filter>Commands</Filter>
+    </ClInclude>
+    <ClInclude Include="ConfigurationContext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Workflows\ConfigurationFlow.h">
+      <Filter>Workflows</Filter>
+    </ClInclude>
+    <ClInclude Include="ConfigurationSetProcessorFactoryRemoting.h">
+      <Filter>Workflows</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -361,6 +382,27 @@
     <ClCompile Include="Workflows\MultiQueryFlow.cpp">
       <Filter>Workflows</Filter>
     </ClCompile>
+    <ClCompile Include="Commands\ConfigureCommand.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Commands\ConfigureShowCommand.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Commands\ConfigureTestCommand.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Commands\ConfigureValidateCommand.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="ConfigurationContext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Workflows\ConfigurationFlow.cpp">
+      <Filter>Workflows</Filter>
+    </ClCompile>
+    <ClCompile Include="ConfigurationSetProcessorFactoryRemoting.cpp">
+      <Filter>Workflows</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />

src/AppInstallerCLICore/Argument.cpp

@@ -164,6 +164,12 @@ namespace AppInstaller::CLI
         case Execution::Args::Type::BlockingPin:
             return { type, "blocking"_liv, ArgTypeCategory::None, ArgTypeExclusiveSet::PinType };
 
+        // Configuration commands
+        case Execution::Args::Type::ConfigurationFile:
+            return { type, "file"_liv, 'f' };
+        case Execution::Args::Type::ConfigurationAcceptWarning:
+            return { type, "accept-configuration-agreements"_liv };
+
         // Common arguments
         case Execution::Args::Type::NoVT:
             return { type, "no-vt"_liv, ArgTypeCategory::None, ArgTypeExclusiveSet::ProgressBarOption };
@@ -196,7 +202,7 @@ namespace AppInstaller::CLI
         case Execution::Args::Type::ToolVersion:
             return { type, "version"_liv, 'v' };
 
-            // Used for demonstration purposes
+        // Used for demonstration purposes
         case Execution::Args::Type::ExperimentalArg:
                 return { type, "arg"_liv };
 

src/AppInstallerCLICore/Argument.h

@@ -89,7 +89,7 @@ namespace AppInstaller::CLI
 
     // An argument to a command; containing only data that is common to all its uses.
     // Argument extends this by adding command-specific values, like help strings.
-    struct  ArgumentCommon
+    struct ArgumentCommon
     {
         // Defines an argument with no alias.
         constexpr static char NoAlias = '\0';

src/AppInstallerCLICore/ChannelStreams.cpp

@@ -96,6 +96,9 @@ namespace AppInstaller::CLI::Execution
     {
         if (m_enabled && m_VTEnabled)
         {
+            // Apply format as normal to ensure that any previous format doesn't bleed through.
+            ApplyFormat();
+
             m_out << sequence;
 
             // An incoming sequence will be valid for 1 "standard" output after this one.
@@ -111,6 +114,9 @@ namespace AppInstaller::CLI::Execution
     {
         if (m_enabled && m_VTEnabled)
         {
+            // Apply format as normal to ensure that any previous format doesn't bleed through.
+            ApplyFormat();
+
             m_out << sequence;
             // An incoming sequence will be valid for 1 "standard" output after this one.
             // We set this to 2 to make that happen, because when it is 1, we will output

src/AppInstallerCLICore/Command.cpp

@@ -70,7 +70,7 @@ namespace AppInstaller::CLI
         }
         else
         {
-            commandChain = commandChain.substr(firstSplit);
+            commandChain = commandChain.substr(firstSplit + 1);
             for (char& c : commandChain)
             {
                 if (c == ParentSplitChar)
@@ -301,6 +301,12 @@ namespace AppInstaller::CLI
             }
         }
 
+        // The command has opted-in to be executed when it has subcommands and the next token is a positional parameter value
+        if (m_selectCurrentCommandIfUnrecognizedSubcommandFound)
+        {
+            return {};
+        }
+
         // TODO: If we get to a large number of commands, do a fuzzy search much like git
         throw CommandException(Resource::String::UnrecognizedCommand(Utility::LocIndView{ *itr }));
     }
@@ -859,6 +865,11 @@ namespace AppInstaller::CLI
         }
     }
 
+    void Command::SelectCurrentCommandIfUnrecognizedSubcommandFound(bool value)
+    {
+        m_selectCurrentCommandIfUnrecognizedSubcommandFound = value;
+    }
+
     void Command::ValidateArgumentsInternal(Execution::Args&) const
     {
         // Do nothing by default.

src/AppInstallerCLICore/Command.h

@@ -113,6 +113,8 @@ namespace AppInstaller::CLI
         virtual void Execute(Execution::Context& context) const;
 
     protected:
+        void SelectCurrentCommandIfUnrecognizedSubcommandFound(bool value);
+
         virtual void ValidateArgumentsInternal(Execution::Args& execArgs) const;
         virtual void ExecuteInternal(Execution::Context& context) const;
 
@@ -124,6 +126,7 @@ namespace AppInstaller::CLI
         Settings::ExperimentalFeature::Feature m_feature;
         Settings::TogglePolicy::Policy m_groupPolicy;
         CommandOutputFlags m_outputFlags;
+        bool m_selectCurrentCommandIfUnrecognizedSubcommandFound = false;
     };
 
     template <typename Container>