Skip to content
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.

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

Configuration commands #3036

Merged
merged 43 commits into from
Mar 8, 2023
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
c7e10fb
Mid-adding commands
JohnMcPMS Feb 15, 2023
dbd1c65
Hook up commands; needs experimental setup still
JohnMcPMS Feb 15, 2023
dfc75e7
Very basic show command hooked up and functional, working on apply
JohnMcPMS Feb 16, 2023
add857d
Expanded show command, implemented apply command. Both need integrat…
JohnMcPMS Feb 17, 2023
35fac60
Change API and flow to better present information as it is available …
JohnMcPMS Feb 28, 2023
9252d9e
Finish updates to show flow
JohnMcPMS Feb 28, 2023
2244699
Config unit test fixes
JohnMcPMS Feb 28, 2023
2164411
Merge branch 'master' into config-command
JohnMcPMS Feb 28, 2023
d30eb2a
Change commands to use existing not implemented path
JohnMcPMS Mar 1, 2023
d83500e
Fix tests that were leaving user settings file around
JohnMcPMS Mar 1, 2023
7343470
Add test processor factory
JohnMcPMS Mar 1, 2023
a553454
Merge branch 'master' into config-command
JohnMcPMS Mar 1, 2023
89706ef
Fixes to integrate with merge
JohnMcPMS Mar 2, 2023
b0ab59d
Configuration processor remoting impl
JohnMcPMS Mar 3, 2023
7239a7d
Merge branch 'master' into config-command
JohnMcPMS Mar 3, 2023
9720812
Improve failure reporting from remoting and set up package project fully
JohnMcPMS Mar 3, 2023
49af67e
Fix async progress callbacks happening on wrong thread context
JohnMcPMS Mar 3, 2023
0769704
Update agreement arg
JohnMcPMS Mar 3, 2023
cd607e3
Spelling fixes
JohnMcPMS Mar 3, 2023
a7f244a
Try AnyCPU build for remoting server
JohnMcPMS Mar 3, 2023
826fd74
Revert "Try AnyCPU build for remoting server"
JohnMcPMS Mar 3, 2023
7658eee
Merge branch 'master' into config-command
JohnMcPMS Mar 3, 2023
8050aeb
Add RIDs :shrug:
JohnMcPMS Mar 3, 2023
862ae92
Use different marshal function
JohnMcPMS Mar 4, 2023
581d323
More RIDs and always pull in from AnyCPU for package
JohnMcPMS Mar 4, 2023
1290142
PR feedback and smoke test in E2E
JohnMcPMS Mar 6, 2023
0b0794f
Add logging and artifact publish to investigate processor build error
JohnMcPMS Mar 6, 2023
b17b2cb
Revert "Add logging and artifact publish to investigate processor bui…
JohnMcPMS Mar 7, 2023
a9e6136
Publish dev package for testing
JohnMcPMS Mar 7, 2023
c9c84a6
Move the package output to maybe be included with the artifacts?
JohnMcPMS Mar 7, 2023
00dab2c
Try moving the appxpackages directory and directly referencing the co…
JohnMcPMS Mar 7, 2023
79a0b8d
Update spelling
JohnMcPMS Mar 7, 2023
1b80556
Fix pipeline
JohnMcPMS Mar 7, 2023
d33eb06
Revert "Revert "Add logging and artifact publish to investigate proce…
JohnMcPMS Mar 7, 2023
7569ed1
More files published
JohnMcPMS Mar 7, 2023
57b0363
Dump build output directory
JohnMcPMS Mar 7, 2023
4b280d3
Fix pipeline
JohnMcPMS Mar 7, 2023
8ded116
Try using OutDir like E2E tests to get correct location on build server
JohnMcPMS Mar 7, 2023
d16ee92
Closing in?
JohnMcPMS Mar 7, 2023
2e09143
Revert OutDir
JohnMcPMS Mar 7, 2023
b076839
Fix relative file path, ignore smoke test for now, add message for pr…
JohnMcPMS Mar 8, 2023
4cbeeec
Remove some debugging steps from pipeline and use win10 RIDs
JohnMcPMS Mar 8, 2023
ca21ff8
Nope, has to be win-arch
JohnMcPMS Mar 8, 2023
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
Prev Previous commit
Next Next commit
Hook up commands; needs experimental setup still
JohnMcPMS committed Feb 15, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit dbd1c65ffa9a7378e4e7884ec595c7fb79776607
2 changes: 2 additions & 0 deletions src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
Original file line number Diff line number Diff line change
@@ -307,6 +307,8 @@
<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="ContextOrchestrator.cpp" />
6 changes: 6 additions & 0 deletions src/AppInstallerCLICore/AppInstallerCLICore.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -379,6 +379,12 @@
<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>
</ItemGroup>
<ItemGroup>
<None Include="PropertySheet.props" />
1 change: 1 addition & 0 deletions src/AppInstallerCLICore/Commands/ConfigureCommand.cpp
Original file line number Diff line number Diff line change
@@ -40,6 +40,7 @@ namespace AppInstaller::CLI

void ConfigureCommand::ExecuteInternal(Execution::Context& context) const
{
UNREFERENCED_PARAMETER(context);
THROW_HR(E_NOTIMPL);
}
}
1 change: 1 addition & 0 deletions src/AppInstallerCLICore/Commands/ConfigureCommand.h
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ namespace AppInstaller::CLI
{
struct ConfigureCommand final : public Command
{
// TODO: Experimental feature
ConfigureCommand(std::string_view parent) : Command("configure", parent) {}

std::vector<std::unique_ptr<Command>> GetCommands() const override;
3 changes: 2 additions & 1 deletion src/AppInstallerCLICore/Commands/ConfigureShowCommand.cpp
Original file line number Diff line number Diff line change
@@ -23,11 +23,12 @@ namespace AppInstaller::CLI
Utility::LocIndView ConfigureShowCommand::HelpLink() const
{
// TODO: Make this exist
return "https://aka.ms/winget-command-configure#show-command"_liv;
return "https://aka.ms/winget-command-configure#show"_liv;
}

void ConfigureShowCommand::ExecuteInternal(Execution::Context& context) const
{
UNREFERENCED_PARAMETER(context);
THROW_HR(E_NOTIMPL);
}
}
34 changes: 34 additions & 0 deletions src/AppInstallerCLICore/Commands/ConfigureTestCommand.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
#include "ConfigureTestCommand.h"

namespace AppInstaller::CLI
{
std::vector<Argument> ConfigureTestCommand::GetArguments() const
{
return {};
}

Resource::LocString ConfigureTestCommand::ShortDescription() const
{
return { Resource::String::ConfigureTestCommandShortDescription };
}

Resource::LocString ConfigureTestCommand::LongDescription() const
{
return { Resource::String::ConfigureTestCommandLongDescription };
}

Utility::LocIndView ConfigureTestCommand::HelpLink() const
{
// TODO: Make this exist
return "https://aka.ms/winget-command-configure#test"_liv;
}

void ConfigureTestCommand::ExecuteInternal(Execution::Context& context) const
{
UNREFERENCED_PARAMETER(context);
THROW_HR(E_NOTIMPL);
}
}
34 changes: 34 additions & 0 deletions src/AppInstallerCLICore/Commands/ConfigureValidateCommand.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.
#include "pch.h"
#include "ConfigureValidateCommand.h"

namespace AppInstaller::CLI
{
std::vector<Argument> ConfigureValidateCommand::GetArguments() const
{
return {};
}

Resource::LocString ConfigureValidateCommand::ShortDescription() const
{
return { Resource::String::ConfigureValidateCommandShortDescription };
}

Resource::LocString ConfigureValidateCommand::LongDescription() const
{
return { Resource::String::ConfigureValidateCommandLongDescription };
}

Utility::LocIndView ConfigureValidateCommand::HelpLink() const
{
// TODO: Make this exist
return "https://aka.ms/winget-command-configure#validate"_liv;
}

void ConfigureValidateCommand::ExecuteInternal(Execution::Context& context) const
{
UNREFERENCED_PARAMETER(context);
THROW_HR(E_NOTIMPL);
}
}
2 changes: 2 additions & 0 deletions src/AppInstallerCLICore/Commands/RootCommand.cpp
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@
#include "ExportCommand.h"
#include "ImportCommand.h"
#include "PinCommand.h"
#include "ConfigureCommand.h"

#include "Resources.h"
#include "TableOutput.h"
@@ -147,6 +148,7 @@ namespace AppInstaller::CLI
std::make_unique<ExportCommand>(FullName()),
std::make_unique<ImportCommand>(FullName()),
std::make_unique<PinCommand>(FullName()),
std::make_unique<ConfigureCommand>(FullName()),
});
}

14 changes: 13 additions & 1 deletion src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
Original file line number Diff line number Diff line change
@@ -1678,7 +1678,7 @@ Please specify one of them using the --source option to proceed.</value>
<comment>{Locked="winget pin","--include-pinned"} {0} is a placeholder replaced by an integer number of packages</comment>
</data>
<data name="ConfigureCommandLongDescription" xml:space="preserve">
<value>Ensures that the system matches the desired state as described by the provided configuration. Ensure that the configuration and the processors are trusted before applying it.</value>
<value>Ensures that the system matches the desired state as described by the provided configuration. May download/execute processors in order to achieve the desired state. The configuration and the processors should be checked to ensure that they are trustworthy before applying them.</value>
</data>
<data name="ConfigureCommandShortDescription" xml:space="preserve">
<value>Configures the system into a desired state</value>
@@ -1689,4 +1689,16 @@ Please specify one of them using the --source option to proceed.</value>
<data name="ConfigureShowCommandShortDescription" xml:space="preserve">
<value>Shows details of a configuration</value>
</data>
<data name="ConfigureTestCommandLongDescription" xml:space="preserve">
<value>Checks that the system matches the desired state as described by the provided configuration. May download/execute processors in order to test the desired state. The configuration and the processors should be checked to ensure that they are trustworthy before executing them.</value>
</data>
<data name="ConfigureTestCommandShortDescription" xml:space="preserve">
<value>Checks the system against a desired state</value>
</data>
<data name="ConfigureValidateCommandLongDescription" xml:space="preserve">
<value>Validates a configuration file for correctness.</value>
</data>
<data name="ConfigureValidateCommandShortDescription" xml:space="preserve">
<value>Validates a configuration file</value>
</data>
</root>