Skip to content

Use C# wrapper objects for PowerShell cmdlet output #2871

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
ryfu-msft merged 18 commits into from
Feb 7, 2023
Merged

Use C# wrapper objects for PowerShell cmdlet output #2871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b1a6198
Add Pester tests and update pipeline
Jan 18, 2023
d2c9978
fix pipeline
Jan 18, 2023
54fdca8
set pwsh to true
Jan 18, 2023
7ae0eec
fix build warnings/errors
Jan 19, 2023
46158cc
fix pester configuration
Jan 19, 2023
b40488a
fix variables
Jan 19, 2023
24e93c5
fix variables again
Jan 19, 2023
deff6f6
try with quotes
Jan 19, 2023
29e3a67
reset pipeline changes
Jan 19, 2023
af91d49
change output type
Jan 19, 2023
6aa9ed9
fix spelling
Jan 19, 2023
8e3bc25
address PR feedback
Jan 19, 2023
43fdff3
remove correlation data
Jan 19, 2023
7cee6af
add support packageversioninfo and compareVersion
Feb 2, 2023
9032db1
consolidate tests into single file
Feb 2, 2023
851cd80
cleanup spelling
Feb 3, 2023
3ddea4d
fix typos
Feb 3, 2023
8d16d00
make catalog package abstract
Feb 6, 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
10 changes: 5 additions & 5 deletions src/PowerShell/Microsoft.WinGet.Client/Commands/FindPackageCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
// -----------------------------------------------------------------------------

namespace Microsoft.WinGet.Client.Commands
{
{
using System.Management.Automation;
using Microsoft.Management.Deployment;
using Microsoft.WinGet.Client.Commands.Common;
using Microsoft.WinGet.Client.Common;

using Microsoft.WinGet.Client.Common;
/// <summary>
/// Searches configured sources for packages.
/// </summary>
[Cmdlet(VerbsCommon.Find, Constants.WinGetNouns.Package)]
[OutputType(typeof(MatchResult))]
[OutputType(typeof(PSObjects.FoundCatalogPackage))]
public sealed class FindPackageCommand : BaseFinderExtendedCommand
{
/// <summary>
Expand All @@ -27,7 +27,7 @@ protected override void ProcessRecord()
var results = this.FindPackages(CompositeSearchBehavior.RemotePackagesFromRemoteCatalogs);
for (var i = 0; i < results.Count; i++)
{
this.WriteObject(results[i]);
this.WriteObject(new PSObjects.FoundCatalogPackage(results[i].CatalogPackage));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/PowerShell/Microsoft.WinGet.Client/Commands/GetPackageCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Microsoft.WinGet.Client.Commands
/// Searches configured sources for packages.
/// </summary>
[Cmdlet(VerbsCommon.Get, Constants.WinGetNouns.Package)]
[OutputType(typeof(CatalogPackage))]
[OutputType(typeof(PSObjects.InstalledCatalogPackage))]
public sealed class GetPackageCommand : BaseFinderExtendedCommand
{
/// <summary>
Expand All @@ -27,7 +27,7 @@ protected override void ProcessRecord()
var results = this.FindPackages(CompositeSearchBehavior.LocalCatalogs);
for (var i = 0; i < results.Count; i++)
{
this.WriteObject(results[i].CatalogPackage);
this.WriteObject(new PSObjects.InstalledCatalogPackage(results[i].CatalogPackage));
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions src/PowerShell/Microsoft.WinGet.Client/Commands/GetSourceCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
namespace Microsoft.WinGet.Client.Commands
{
using System.Management.Automation;
using Microsoft.Management.Deployment;
using Microsoft.WinGet.Client.Commands.Common;
using Microsoft.WinGet.Client.Common;

/// <summary>
/// Retrieves the list of configured sources.
/// </summary>
[Cmdlet(VerbsCommon.Get, Constants.WinGetNouns.Source)]
[OutputType(typeof(PackageCatalogReference))]
[OutputType(typeof(PSObjects.SourceResult))]
public sealed class GetSourceCommand : BaseClientCommand
{
/// <summary>
Expand All @@ -36,7 +35,7 @@ protected override void ProcessRecord()
var results = GetPackageCatalogReferences(this.Name);
for (var i = 0; i < results.Count; i++)
{
this.WriteObject(results[i]);
this.WriteObject(new PSObjects.SourceResult(results[i]));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/PowerShell/Microsoft.WinGet.Client/Commands/InstallPackageCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Microsoft.WinGet.Client.Commands
Constants.WinGetNouns.Package,
DefaultParameterSetName = Constants.FoundSet,
SupportsShouldProcess = true)]
[OutputType(typeof(InstallResult))]
[OutputType(typeof(PSObjects.InstallResult))]
public sealed class InstallPackageCommand : BaseInstallCommand
{
private ProcessorArchitecture architecture;
Expand Down Expand Up @@ -66,7 +66,7 @@ protected override void ProcessRecord()
{
InstallOptions options = this.GetInstallOptions(version);
InstallResult result = this.InstallPackage(package, options);
this.WriteObject(result);
this.WriteObject(new PSObjects.InstallResult(result));
});
}

Expand Down
4 changes: 2 additions & 2 deletions src/PowerShell/Microsoft.WinGet.Client/Commands/UninstallPackageCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace Microsoft.WinGet.Client.Commands
Constants.WinGetNouns.Package,
DefaultParameterSetName = Constants.FoundSet,
SupportsShouldProcess = true)]
[OutputType(typeof(UninstallResult))]
[OutputType(typeof(PSObjects.UninstallResult))]
public sealed class UninstallPackageCommand : BasePackageCommand
{
/// <summary>
Expand All @@ -46,7 +46,7 @@ protected override void ProcessRecord()
{
UninstallOptions options = this.GetUninstallOptions(version);
UninstallResult result = this.UninstallPackage(package, options);
this.WriteObject(result);
this.WriteObject(new PSObjects.UninstallResult(result));
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/PowerShell/Microsoft.WinGet.Client/Commands/UpdatePackageCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace Microsoft.WinGet.Client.Commands
Constants.WinGetNouns.Package,
DefaultParameterSetName = Constants.FoundSet,
SupportsShouldProcess = true)]
[OutputType(typeof(InstallResult))]
[OutputType(typeof(PSObjects.InstallResult))]
public sealed class UpdatePackageCommand : BaseInstallCommand
{
/// <summary>
Expand Down
Loading