ensureAction)
@@ -130,18 +130,18 @@ public void ensure_source_app_installed(ChocolateyConfiguration config, Action additionalActionsBeforeScript);
+
+ PowerShellExecutionResults run_host(ChocolateyConfiguration config, string chocoPowerShellScript, Action additionalActionsBeforeScript, IEnumerable hookPreScriptPathList, IEnumerable hookPostScriptPathList);
}
}
diff --git a/src/chocolatey/infrastructure.app/services/ISourceRunner.cs b/src/chocolatey/infrastructure.app/services/ISourceRunner.cs
index 1950bda94a..3a1aaac649 100644
--- a/src/chocolatey/infrastructure.app/services/ISourceRunner.cs
+++ b/src/chocolatey/infrastructure.app/services/ISourceRunner.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017 - 2021 Chocolatey Software, Inc
+// Copyright © 2017 - 2022 Chocolatey Software, Inc
// Copyright © 2011 - 2017 RealDimensions Software, LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,10 +19,12 @@ namespace chocolatey.infrastructure.app.services
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
+ using chocolatey.infrastructure.app.attributes;
using configuration;
using domain;
using results;
+ [MultiService]
public interface ISourceRunner
{
///
@@ -31,7 +33,7 @@ public interface ISourceRunner
///
/// The type of the source.
///
- SourceType SourceType { get; }
+ string SourceType { get; }
///
/// Ensures the application that controls a source is installed
diff --git a/src/chocolatey/infrastructure.app/services/NugetService.cs b/src/chocolatey/infrastructure.app/services/NugetService.cs
index 97085b77b0..651cd84e68 100644
--- a/src/chocolatey/infrastructure.app/services/NugetService.cs
+++ b/src/chocolatey/infrastructure.app/services/NugetService.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017 - 2021 Chocolatey Software, Inc
+// Copyright © 2017 - 2022 Chocolatey Software, Inc
// Copyright © 2011 - 2017 RealDimensions Software, LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -71,9 +71,9 @@ public NugetService(IFileSystem fileSystem, ILogger nugetLogger, IChocolateyPack
_packageDownloader = packageDownloader;
}
- public SourceType SourceType
+ public string SourceType
{
- get { return SourceType.normal; }
+ get { return SourceTypes.NORMAL; }
}
public void ensure_source_app_installed(ChocolateyConfiguration config, Action ensureAction)
@@ -328,7 +328,6 @@ public virtual void push_run(ChocolateyConfiguration config)
NugetPush.push_package(config, _fileSystem.get_full_path(nupkgFilePath));
-
if (config.RegularOutput && (config.Sources.is_equal_to(ApplicationParameters.ChocolateyCommunityFeedPushSource) || config.Sources.is_equal_to(ApplicationParameters.ChocolateyCommunityFeedPushSourceOld)))
{
this.Log().Warn(ChocolateyLoggers.Important, () => @"
@@ -436,13 +435,13 @@ public virtual ConcurrentDictionary install_run(Chocolate
uninstallSuccessAction: null,
addUninstallHandler: true);
- var originalConfig = config.deep_copy();
+ config.start_backup();
foreach (string packageName in packageNames.or_empty_list_if_null())
{
- // reset config each time through
- config = originalConfig.deep_copy();
-
+ // We need to ensure we are using a clean configuration file
+ // before we start reading it.
+ config.reset_config();
//todo: #2577 get smarter about realizing multiple versions have been installed before and allowing that
IPackage installedPackage = packageManager.LocalRepository.FindPackage(packageName);
@@ -555,6 +554,11 @@ Version was specified as '{0}'. It is possible that version
}
}
+ // Reset the configuration again once we are completely done with the processing of
+ // configurations, and make sure that we are removing any backup that was created
+ // as part of this run.
+ config.reset_config(removeBackup: true);
+
return packageInstalls;
}
@@ -617,23 +621,17 @@ public virtual ConcurrentDictionary upgrade_run(Chocolate
uninstallSuccessAction: null,
addUninstallHandler: false);
- var localRepository = packageManager.LocalRepository as ChocolateyLocalPackageRepository;
-
- if (localRepository != null)
- {
- localRepository.IgnoreVersionedDirectories = !config.AllowMultipleVersions;
- }
-
var configIgnoreDependencies = config.IgnoreDependencies;
set_package_names_if_all_is_specified(config, () => { config.IgnoreDependencies = true; });
config.IgnoreDependencies = configIgnoreDependencies;
- var originalConfig = config.deep_copy();
+ config.start_backup();
foreach (string packageName in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null())
{
- // reset config each time through
- config = originalConfig.deep_copy();
+ // We need to ensure we are using a clean configuration file
+ // before we start reading it.
+ config.reset_config();
IPackage installedPackage = packageManager.LocalRepository.FindPackage(packageName);
@@ -885,6 +883,11 @@ public virtual ConcurrentDictionary upgrade_run(Chocolate
}
}
+ // Reset the configuration again once we are completely done with the processing of
+ // configurations, and make sure that we are removing any backup that was created
+ // as part of this run.
+ config.reset_config(removeBackup: true);
+
return packageInstalls;
}
@@ -904,12 +907,13 @@ public virtual ConcurrentDictionary get_outdated(Chocolat
set_package_names_if_all_is_specified(config, () => { config.IgnoreDependencies = true; });
var packageNames = config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null().ToList();
- var originalConfig = config.deep_copy();
+ config.start_backup();
foreach (var packageName in packageNames)
{
- // reset config each time through
- config = originalConfig.deep_copy();
+ // We need to ensure we are using a clean configuration file
+ // before we start reading it.
+ config.reset_config();
var installedPackage = packageManager.LocalRepository.FindPackage(packageName);
var pkgInfo = _packageInfoService.get_package_information(installedPackage);
@@ -957,8 +961,22 @@ public virtual ConcurrentDictionary get_outdated(Chocolat
packageResult.Messages.Add(new ResultMessage(ResultType.Note, logMessage));
this.Log().Info("{0}|{1}|{2}|{3}".format_with(installedPackage.Id, installedPackage.Version, latestPackage.Version, isPinned.to_string().to_lower()));
+
+ if (pkgInfo.IsSideBySide)
+ {
+ var deprecationMessage = @"
+{0} v{1} has been installed as a side by side installation.
+Side by side installations are deprecated and is pending removal in v2.0.0".format_with(installedPackage.Id, installedPackage.Version);
+
+ packageResult.Messages.Add(new ResultMessage(ResultType.Warn, deprecationMessage));
+ }
}
+ // Reset the configuration again once we are completely done with the processing of
+ // configurations, and make sure that we are removing any backup that was created
+ // as part of this run.
+ config.reset_config(removeBackup: true);
+
return outdatedPackages;
}
@@ -1232,7 +1250,6 @@ private void remove_nuget_cache_for_package(IPackage installedPackage)
var nugetCachedFile = _fileSystem.combine_paths(localAppData, "NuGet", "Cache", "{0}.{1}.nupkg".format_with(installedPackage.Id, installedPackage.Version.to_string()));
if (_fileSystem.file_exists(nugetCachedFile))
{
-
_fileSystem.delete_file(nugetCachedFile);
}
},
@@ -1273,6 +1290,8 @@ public virtual ConcurrentDictionary uninstall_run(Chocola
{
var pkg = e.Package;
+ // TODO: Removal special handling for SxS packages once we hit v2.0.0
+
// this section fires twice sometimes, like for older packages in a sxs install...
var packageResult = packageUninstalls.GetOrAdd(pkg.Id.to_lower() + "." + pkg.Version.to_string(), new PackageResult(pkg, e.InstallPath));
packageResult.InstallLocation = e.InstallPath;
@@ -1371,12 +1390,13 @@ public virtual ConcurrentDictionary uninstall_run(Chocola
config.ForceDependencies = false;
});
- var originalConfig = config.deep_copy();
+ config.start_backup();
foreach (string packageName in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null())
{
- // reset config each time through
- config = originalConfig.deep_copy();
+ // We need to ensure we are using a clean configuration file
+ // before we start reading it.
+ config.reset_config();
IList installedPackageVersions = new List();
if (string.IsNullOrWhiteSpace(config.Version))
@@ -1504,6 +1524,11 @@ public virtual ConcurrentDictionary uninstall_run(Chocola
}
}
+ // Reset the configuration again once we are completely done with the processing of
+ // configurations, and make sure that we are removing any backup that was created
+ // as part of this run.
+ config.reset_config(removeBackup: true);
+
return packageUninstalls;
}
diff --git a/src/chocolatey/infrastructure.app/services/PowershellService.cs b/src/chocolatey/infrastructure.app/services/PowershellService.cs
index 0faf6952d3..6f1be64f55 100644
--- a/src/chocolatey/infrastructure.app/services/PowershellService.cs
+++ b/src/chocolatey/infrastructure.app/services/PowershellService.cs
@@ -1,4 +1,4 @@
-// Copyright © 2017 - 2021 Chocolatey Software, Inc
+// Copyright © 2017 - 2022 Chocolatey Software, Inc
// Copyright © 2011 - 2017 RealDimensions Software, LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,10 +23,7 @@ namespace chocolatey.infrastructure.app.services
using System.Management.Automation;
using System.Management.Automation.Runspaces;
using System.Reflection;
- using System.Security.Cryptography;
- using System.Text;
using adapters;
- using builders;
using commandline;
using configuration;
using cryptography;
@@ -38,8 +35,6 @@ namespace chocolatey.infrastructure.app.services
using powershell;
using results;
using utility;
- using Assembly = adapters.Assembly;
- using Console = System.Console;
using CryptoHashProvider = cryptography.CryptoHashProvider;
using Environment = System.Environment;
using IFileSystem = filesystem.IFileSystem;
@@ -89,6 +84,51 @@ private string get_script_for_action(PackageResult packageResult, CommandNameTyp
return string.Empty;
}
+ private IEnumerable get_hook_scripts(ChocolateyConfiguration configuration, PackageResult packageResult, CommandNameType command, bool isPreHook)
+ {
+ List hookScriptPaths = new List();
+
+ // If skipping hook scripts, return an empty list
+ if (configuration.SkipHookScripts) return hookScriptPaths;
+
+ // If hooks directory doesn't exist, return an empty list to prevent directory not exist warnings
+ if (!_fileSystem.directory_exists(ApplicationParameters.HooksLocation)) return hookScriptPaths;
+
+ string filenameBase;
+
+ if (isPreHook)
+ {
+ filenameBase = "pre-";
+ }
+ else
+ {
+ filenameBase = "post-";
+ }
+
+ switch (command)
+ {
+ case CommandNameType.install:
+ filenameBase += "install-";
+ break;
+
+ case CommandNameType.uninstall:
+ filenameBase += "uninstall-";
+ break;
+
+ case CommandNameType.upgrade:
+ filenameBase += "beforemodify-";
+ break;
+
+ default:
+ throw new ApplicationException("Could not find CommandNameType '{0}' to get hook scripts".format_with(command));
+ }
+
+ hookScriptPaths.AddRange(_fileSystem.get_files(ApplicationParameters.HooksLocation, "{0}all.ps1".format_with(filenameBase), SearchOption.AllDirectories));
+ hookScriptPaths.AddRange(_fileSystem.get_files(ApplicationParameters.HooksLocation, "{0}{1}.ps1".format_with(filenameBase, packageResult.Name), SearchOption.AllDirectories));
+
+ return hookScriptPaths;
+ }
+
public void noop_action(PackageResult packageResult, CommandNameType command)
{
var chocoInstall = get_script_for_action(packageResult, command);
@@ -134,7 +174,7 @@ private string get_helpers_folder()
return _fileSystem.combine_paths(ApplicationParameters.InstallLocation, "helpers");
}
- public string wrap_script_with_module(string script, ChocolateyConfiguration config)
+ public string wrap_script_with_module(string script, IEnumerable hookPreScriptPathList, IEnumerable hookPostScriptPathList, ChocolateyConfiguration config)
{
var installerModule = _fileSystem.combine_paths(get_helpers_folder(), "chocolateyInstaller.psm1");
var scriptRunner = _fileSystem.combine_paths(get_helpers_folder(), "chocolateyScriptRunner.ps1");
@@ -148,18 +188,20 @@ public string wrap_script_with_module(string script, ChocolateyConfiguration con
installerModule,
scriptRunner,
string.IsNullOrWhiteSpace(_customImports) ? string.Empty : "& {0}".format_with(_customImports.EndsWith(";") ? _customImports : _customImports + ";"),
- get_script_arguments(script, config)
+ get_script_arguments(script, hookPreScriptPathList, hookPostScriptPathList, config)
);
}
- private string get_script_arguments(string script, ChocolateyConfiguration config)
+ private string get_script_arguments(string script, IEnumerable hookPreScriptPathList, IEnumerable