Skip to content

Commit e778fe0

Browse files
committed
Change argument description, exclude .Dev module, update tests for .Dev module
1 parent f9e51ea commit e778fe0

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

src/AppInstallerCLICore/Commands/DscCommand.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace AppInstaller::CLI
1717
{
1818
Argument GetOutputFileArgument()
1919
{
20-
return { Execution::Args::Type::OutputFile, Resource::String::OutputFileArgumentDescription, ArgumentType::Standard };
20+
return { Execution::Args::Type::OutputFile, Resource::String::OutputDirectoryArgumentDescription, ArgumentType::Standard };
2121
}
2222
}
2323

src/AppInstallerCLICore/Resources.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ namespace AppInstaller::CLI::Resource
483483
WINGET_DEFINE_RESOURCE_STRINGID(OpenSourceFailedNoMatchHelp);
484484
WINGET_DEFINE_RESOURCE_STRINGID(OpenSourceFailedNoSourceDefined);
485485
WINGET_DEFINE_RESOURCE_STRINGID(Options);
486+
WINGET_DEFINE_RESOURCE_STRINGID(OutputDirectoryArgumentDescription);
486487
WINGET_DEFINE_RESOURCE_STRINGID(OutputFileArgumentDescription);
487488
WINGET_DEFINE_RESOURCE_STRINGID(OverrideArgumentDescription);
488489
WINGET_DEFINE_RESOURCE_STRINGID(OverwritingExistingFileAtMessage);

src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace AppInstaller::CLI::Workflow
7777
};
7878

7979
static const std::wstring s_PackageSettingsExclusionList[] = {
80-
L"Microsoft.WinGet/", L"Microsoft.DSC.Debug/", L"Microsoft.DSC/", L"Microsoft.DSC.Transitional/", L"Microsoft.Windows/RebootPending",
80+
L"Microsoft.WinGet/", L"Microsoft.WinGet.Dev/", L"Microsoft.DSC.Debug/", L"Microsoft.DSC/", L"Microsoft.DSC.Transitional/", L"Microsoft.Windows/RebootPending",
8181
L"Microsoft.Windows/Registry", L"Microsoft.Windows/WMI", L"Microsoft.Windows/WindowsPowerShell", L"Microsoft/OSInfo"
8282
};
8383

src/AppInstallerCLIE2ETests/ConfigureCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,12 +330,12 @@ public void DSCv3_Export()
330330
var exportDir = TestCommon.GetRandomTestDir();
331331
var exportFile = Path.Combine(exportDir, "exported.yml");
332332

333-
result = TestCommon.RunAICLICommand("test config-export-units", $"-o {exportFile} --resource Microsoft.WinGet/TestJSON --verbose");
333+
result = TestCommon.RunAICLICommand("test config-export-units", $"-o {exportFile} --resource Microsoft.WinGet.Dev/TestJSON --verbose");
334334
Assert.AreEqual(0, result.ExitCode);
335335

336336
Assert.True(File.Exists(exportFile));
337337
string exportText = File.ReadAllText(exportFile);
338-
Assert.True(exportText.Contains("Microsoft.WinGet/TestJSON"));
338+
Assert.True(exportText.Contains("Microsoft.WinGet.Dev/TestJSON"));
339339
Assert.True(exportText.Contains(propertyName1));
340340
Assert.True(exportText.Contains(propertyName2));
341341
Assert.True(exportText.Contains(propertyValue1));

src/AppInstallerCLIE2ETests/TestData/Configuration/ShowDetails_DSCv3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
processor: dscv3
55
resources:
66
- name: Test File
7-
type: Microsoft.WinGet/TestFile
7+
type: Microsoft.WinGet.Dev/TestFile
88
metadata:
99
description: Description 1.
1010
properties:

src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3345,4 +3345,7 @@ Please specify one of them using the --source option to proceed.</value>
33453345
<data name="ConfigurationExportFailedToGetUnitProcessors" xml:space="preserve">
33463346
<value>Failed to get unit processors. Individual package settings will not be exported.</value>
33473347
</data>
3348-
</root>
3348+
<data name="OutputDirectoryArgumentDescription" xml:space="preserve">
3349+
<value>Directory where the results are to be written</value>
3350+
</data>
3351+
</root>

0 commit comments

Comments
 (0)