From 5ba47748c1be075458815006e2e409571d0bd397 Mon Sep 17 00:00:00 2001 From: quoctruong91 Date: Tue, 12 Jul 2016 21:11:53 -0700 Subject: [PATCH] Remove logging for installation from OneGet on Linux --- .../Repository/PackageRepositoryFactory.cs | 8 ++++++++ .../Cmdlets/CmdletBase.cs | 2 ++ .../Cmdlets/CmdletWithSearchAndSource.cs | 2 ++ .../Cmdlets/SavePackage.cs | 2 ++ .../Cmdlets/UninstallPackage.cs | 2 ++ 5 files changed, 16 insertions(+) diff --git a/src/Microsoft.PackageManagement.NuGetProvider/Repository/PackageRepositoryFactory.cs b/src/Microsoft.PackageManagement.NuGetProvider/Repository/PackageRepositoryFactory.cs index 771651e32..7a34b30bf 100644 --- a/src/Microsoft.PackageManagement.NuGetProvider/Repository/PackageRepositoryFactory.cs +++ b/src/Microsoft.PackageManagement.NuGetProvider/Repository/PackageRepositoryFactory.cs @@ -19,6 +19,14 @@ throw new ArgumentNullException("packageSource"); } +#if LINUX + // we cannot call new uri on file path on linux because it will error out + if (System.IO.Directory.Exists(packageSource)) + { + return new LocalPackageRepository(packageSource, request); + } +#endif + Uri uri = new Uri(packageSource); if (uri.IsFile) diff --git a/src/Microsoft.PowerShell.PackageManagement/Cmdlets/CmdletBase.cs b/src/Microsoft.PowerShell.PackageManagement/Cmdlets/CmdletBase.cs index 85d9ddbc1..0fe9b6dee 100644 --- a/src/Microsoft.PowerShell.PackageManagement/Cmdlets/CmdletBase.cs +++ b/src/Microsoft.PowerShell.PackageManagement/Cmdlets/CmdletBase.cs @@ -506,6 +506,7 @@ namespace Microsoft.PowerShell.PackageManagement.Cmdlets { Save = 4103 } +#if !LINUX protected void LogEvent(EventTask task, EventId id, string context, string name, string version, string providerName, string source, string status, string destinationPath) { var iis = InitialSessionState.CreateDefault2(); @@ -536,6 +537,7 @@ namespace Microsoft.PowerShell.PackageManagement.Cmdlets { } } } +#endif #endregion } diff --git a/src/Microsoft.PowerShell.PackageManagement/Cmdlets/CmdletWithSearchAndSource.cs b/src/Microsoft.PowerShell.PackageManagement/Cmdlets/CmdletWithSearchAndSource.cs index 260542f61..47e602b3a 100644 --- a/src/Microsoft.PowerShell.PackageManagement/Cmdlets/CmdletWithSearchAndSource.cs +++ b/src/Microsoft.PowerShell.PackageManagement/Cmdlets/CmdletWithSearchAndSource.cs @@ -685,6 +685,7 @@ namespace Microsoft.PowerShell.PackageManagement.Cmdlets { } WriteObject(AddPropertyToSoftwareIdentity(installedPkg)); +#if !LINUX LogEvent(EventTask.Install, EventId.Install, Resources.Messages.PackageInstalled, installedPkg.Name, @@ -694,6 +695,7 @@ namespace Microsoft.PowerShell.PackageManagement.Cmdlets { installedPkg.Status ?? string.Empty, installedPkg.InstallationPath ?? string.Empty); TraceMessage(Constants.InstallPackageTrace, installedPkg); +#endif triedInstallCount++; } } diff --git a/src/Microsoft.PowerShell.PackageManagement/Cmdlets/SavePackage.cs b/src/Microsoft.PowerShell.PackageManagement/Cmdlets/SavePackage.cs index 1d341eed4..fafa0d962 100644 --- a/src/Microsoft.PowerShell.PackageManagement/Cmdlets/SavePackage.cs +++ b/src/Microsoft.PowerShell.PackageManagement/Cmdlets/SavePackage.cs @@ -254,8 +254,10 @@ namespace Microsoft.PowerShell.PackageManagement.Cmdlets { } WriteObject(AddPropertyToSoftwareIdentity(downloadedPkg)); +#if !LINUX LogEvent(EventTask.Download, EventId.Save, Resources.Messages.PackageSaved, downloadedPkg.Name, downloadedPkg.Version, downloadedPkg.ProviderName, downloadedPkg.Source ?? string.Empty, downloadedPkg.Status ?? string.Empty, downloadedPkg.InstallationPath ?? string.Empty); TraceMessage(Constants.SavePackageTrace, downloadedPkg); +#endif } } diff --git a/src/Microsoft.PowerShell.PackageManagement/Cmdlets/UninstallPackage.cs b/src/Microsoft.PowerShell.PackageManagement/Cmdlets/UninstallPackage.cs index 7a99eb647..6e2e9ae5b 100644 --- a/src/Microsoft.PowerShell.PackageManagement/Cmdlets/UninstallPackage.cs +++ b/src/Microsoft.PowerShell.PackageManagement/Cmdlets/UninstallPackage.cs @@ -168,8 +168,10 @@ namespace Microsoft.PowerShell.PackageManagement.Cmdlets { return false; } WriteObject(installedPkg); +#if !LINUX LogEvent(EventTask.Uninstall, EventId.Uninstall, Resources.Messages.PackageUnInstalled, installedPkg.Name, installedPkg.Version, installedPkg.ProviderName, installedPkg.Source ?? string.Empty, installedPkg.Status ?? string.Empty, installedPkg.InstallationPath ?? string.Empty); TraceMessage(Constants.UnInstallPackageTrace, installedPkg); +#endif } } } catch (Exception e) {