Skip to content

Commit 23379b7

Browse files
ferventcoderferventcoder
committed
Merge branch 'stable'
* stable: (doc) update CHANGELOG/nuspec (maint) formatting (GH-735) Remove actual when uninstalling meta (GH-455) Summary - log reason for warnings/errors (GH-735) split package list from all operation (GH-710) If timeout, inform user (maint) add review note (GH-689) Report install location (GH-755) Track more MSI information (maint) Template specs - restrict to Windows only
2 parents 46858b3 + f6e5c1d commit 23379b7

11 files changed

Lines changed: 350 additions & 54 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
5656
* Provide PowerShell tab completion for Chocolatey - see [#412](https://github.com/chocolatey/choco/issues/412)
5757
* [Security] Sign the powershell scripts and assemblies - see [#501](https://github.com/chocolatey/choco/issues/501)
5858
* Add a `choco info` command to show info for one package - see [#644](https://github.com/chocolatey/choco/issues/644)
59+
* Mark packages pending until install completes successfully - see [#198](https://github.com/chocolatey/choco/issues/198)
5960
* Resolve sources by name - see [#356](https://github.com/chocolatey/choco/issues/356)
6061
* Pro/Business - Ubiquitous Install Directory Switch - see [#258](https://github.com/chocolatey/choco/issues/258)
6162
* Pro/Business - Runtime Virus Scanning - see [virus scanning](https://chocolatey.org/docs/features-virus-check)
@@ -91,6 +92,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
9192
* [POSH Host] Fix - PowerShell Host doesn't show colorization overrides - see [#674](https://github.com/chocolatey/choco/issues/674)
9293
* [POSH Host] Fix - $profile is empty string when installing packages - does not automatically install the ChocolateyProfile - see [#667](https://github.com/chocolatey/choco/issues/667)
9394
* [POSH Host] Fix - Getting LCID doesn't work properly with the built-in PowerShell - see [#741](https://github.com/chocolatey/choco/issues/741)
95+
* [POSH Host] Fix - Host.Version should return actual PowerShell version - see [#708](https://github.com/chocolatey/choco/issues/708)
9496
* Fix - Verbose shows in output on debug switch - see [#611](https://github.com/chocolatey/choco/issues/611)
9597
* Fix - Get-ChocolateyUnzip captures files that don't belong to the package / Unzip should not do a full disk scan - see [#616](https://github.com/chocolatey/choco/issues/616) and [#155](https://github.com/chocolatey/choco/issues/155)
9698
* Fix - Package succeeds but software install silently fails when Install-ChocolateyInstallPackage has the wrong arguments - see [#629](https://github.com/chocolatey/choco/issues/629)
@@ -111,6 +113,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
111113
* Fix - Package params are also applied to dependent package - see [#733](https://github.com/chocolatey/choco/issues/733)
112114
* Fix - Use package name/version from environment, not parameters - see [#751](https://github.com/chocolatey/choco/issues/751)
113115
* Fix - Get-WebFileName Does Not Match on Invalid Characters - see [#753](https://github.com/chocolatey/choco/issues/753)
116+
* Fix - `choco new` cannot introduce multistage folder hierarchy template - see [#706](https://github.com/chocolatey/choco/issues/706)
114117

115118
### IMPROVEMENTS
116119

@@ -149,6 +152,14 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
149152
* Clean up any temp nuget folder actions after NuGet operations - see [#622](https://github.com/chocolatey/choco/issues/622)
150153
* Ensure Web Requests and Responses Do Not Timeout - make configurable - see [#732](https://github.com/chocolatey/choco/issues/732)
151154
* Combine timeout from push and execution timeout as one parameter - see [#752](https://github.com/chocolatey/choco/issues/752)
155+
* Override autouninstaller / failonautouninstaller fail with switches for uninstall - see [#515](https://github.com/chocolatey/choco/issues/515)
156+
* Offer to remove actual package (*.install/*.portable) when removing meta/virtual package - see [#735](https://github.com/chocolatey/choco/issues/735)
157+
* Provide more info in package summary - see [#455](https://github.com/chocolatey/choco/issues/455)
158+
* Report install location - see [#689](https://github.com/chocolatey/choco/issues/689)
159+
* Track MSI Information Better - see [#755](https://github.com/chocolatey/choco/issues/755)
160+
* Support for client certificates - see [#399](https://github.com/chocolatey/choco/issues/399)
161+
* choco feature list formatting enhancements - see [#742](https://github.com/chocolatey/choco/issues/742)
162+
* choco new --original-template - see [#737](https://github.com/chocolatey/choco/issues/737)
152163
* Pro/Business - Also check for license in User Profile location - see [#606](https://github.com/chocolatey/choco/issues/606)
153164
* Pro/Business - Set download cache information if available - see [#562](https://github.com/chocolatey/choco/issues/562)
154165
* Pro/Business - Allow commands to be added - see [#583](https://github.com/chocolatey/choco/issues/583)
@@ -157,6 +168,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
157168
* Pro/Business - Add switch to fail on invalid or missing license - see [#596](https://github.com/chocolatey/choco/issues/596)
158169
* Pro/Business - add ignore invalid switches/parameters - see [#586](https://github.com/chocolatey/choco/issues/586)
159170
* Pro/Business - Don't prompt to upload file for virus scanning if it is too large - see [#695](https://github.com/chocolatey/choco/issues/695)
171+
* Pro/Business - add 'support' command - see [#745](https://github.com/chocolatey/choco/issues/745)
160172
* API - Add the ability to retrieve package count for a Source - see [#431](https://github.com/chocolatey/choco/issues/431)
161173
* API - Chocolatey Lib still marks vital package information as internal - see [#433](https://github.com/chocolatey/choco/issues/433)
162174
* API - Add paging to list command - see [#427](https://github.com/chocolatey/choco/issues/427)

‎nuget/chocolatey/chocolatey.nuspec‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
111111
* Provide PowerShell tab completion for Chocolatey - see [#412](https://github.com/chocolatey/choco/issues/412)
112112
* [Security] Sign the powershell scripts and assemblies - see [#501](https://github.com/chocolatey/choco/issues/501)
113113
* Add a `choco info` command to show info for one package - see [#644](https://github.com/chocolatey/choco/issues/644)
114+
* Mark packages pending until install completes successfully - see [#198](https://github.com/chocolatey/choco/issues/198)
114115
* Resolve sources by name - see [#356](https://github.com/chocolatey/choco/issues/356)
115116
* Pro/Business - Ubiquitous Install Directory Switch - see [#258](https://github.com/chocolatey/choco/issues/258)
116117
* Pro/Business - Runtime Virus Scanning - see [virus scanning](https://chocolatey.org/docs/features-virus-check)
@@ -146,6 +147,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
146147
* [POSH Host] Fix - PowerShell Host doesn't show colorization overrides - see [#674](https://github.com/chocolatey/choco/issues/674)
147148
* [POSH Host] Fix - $profile is empty string when installing packages - does not automatically install the ChocolateyProfile - see [#667](https://github.com/chocolatey/choco/issues/667)
148149
* [POSH Host] Fix - Getting LCID doesn't work properly with the built-in PowerShell - see [#741](https://github.com/chocolatey/choco/issues/741)
150+
* [POSH Host] Fix - Host.Version should return actual PowerShell version - see [#708](https://github.com/chocolatey/choco/issues/708)
149151
* Fix - Verbose shows in output on debug switch - see [#611](https://github.com/chocolatey/choco/issues/611)
150152
* Fix - Get-ChocolateyUnzip captures files that don't belong to the package / Unzip should not do a full disk scan - see [#616](https://github.com/chocolatey/choco/issues/616) and [#155](https://github.com/chocolatey/choco/issues/155)
151153
* Fix - Package succeeds but software install silently fails when Install-ChocolateyInstallPackage has the wrong arguments - see [#629](https://github.com/chocolatey/choco/issues/629)
@@ -166,6 +168,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
166168
* Fix - Package params are also applied to dependent package - see [#733](https://github.com/chocolatey/choco/issues/733)
167169
* Fix - Use package name/version from environment, not parameters - see [#751](https://github.com/chocolatey/choco/issues/751)
168170
* Fix - Get-WebFileName Does Not Match on Invalid Characters - see [#753](https://github.com/chocolatey/choco/issues/753)
171+
* Fix - `choco new` cannot introduce multistage folder hierarchy template - see [#706](https://github.com/chocolatey/choco/issues/706)
169172

170173
### IMPROVEMENTS
171174

@@ -204,6 +207,14 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
204207
* Clean up any temp nuget folder actions after NuGet operations - see [#622](https://github.com/chocolatey/choco/issues/622)
205208
* Ensure Web Requests and Responses Do Not Timeout - make configurable - see [#732](https://github.com/chocolatey/choco/issues/732)
206209
* Combine timeout from push and execution timeout as one parameter - see [#752](https://github.com/chocolatey/choco/issues/752)
210+
* Override autouninstaller / failonautouninstaller fail with switches for uninstall - see [#515](https://github.com/chocolatey/choco/issues/515)
211+
* Offer to remove actual package (*.install/*.portable) when removing meta/virtual package - see [#735](https://github.com/chocolatey/choco/issues/735)
212+
* Provide more info in package summary - see [#455](https://github.com/chocolatey/choco/issues/455)
213+
* Report install location - see [#689](https://github.com/chocolatey/choco/issues/689)
214+
* Track MSI Information Better - see [#755](https://github.com/chocolatey/choco/issues/755)
215+
* Support for client certificates - see [#399](https://github.com/chocolatey/choco/issues/399)
216+
* choco feature list formatting enhancements - see [#742](https://github.com/chocolatey/choco/issues/742)
217+
* choco new --original-template - see [#737](https://github.com/chocolatey/choco/issues/737)
207218
* Pro/Business - Also check for license in User Profile location - see [#606](https://github.com/chocolatey/choco/issues/606)
208219
* Pro/Business - Set download cache information if available - see [#562](https://github.com/chocolatey/choco/issues/562)
209220
* Pro/Business - Allow commands to be added - see [#583](https://github.com/chocolatey/choco/issues/583)
@@ -212,6 +223,7 @@ If you need the previous behavior, be sure to disable the feature `usePackageExi
212223
* Pro/Business - Add switch to fail on invalid or missing license - see [#596](https://github.com/chocolatey/choco/issues/596)
213224
* Pro/Business - add ignore invalid switches/parameters - see [#586](https://github.com/chocolatey/choco/issues/586)
214225
* Pro/Business - Don't prompt to upload file for virus scanning if it is too large - see [#695](https://github.com/chocolatey/choco/issues/695)
226+
* Pro/Business - add 'support' command - see [#745](https://github.com/chocolatey/choco/issues/745)
215227
* API - Add the ability to retrieve package count for a Source - see [#431](https://github.com/chocolatey/choco/issues/431)
216228
* API - Chocolatey Lib still marks vital package information as internal - see [#433](https://github.com/chocolatey/choco/issues/433)
217229
* API - Add paging to list command - see [#427](https://github.com/chocolatey/choco/issues/427)

‎src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,5 +161,6 @@ param(
161161
default { throw "7-Zip signalled an unknown error (code $exitCode)" }
162162
}
163163

164+
$env:ChocolateyPackageInstallLocation = $destination
164165
return $destination
165166
}

‎src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ param(
8282
Write-Warning "Unable to generate `'$ignoreFile`'"
8383
}
8484

85+
$env:ChocolateyInstallerType = $fileType
86+
8587
$additionalInstallArgs = $env:chocolateyInstallArguments;
8688
if ($additionalInstallArgs -eq $null) {
8789
$additionalInstallArgs = '';

‎src/chocolatey.tests/infrastructure.app/services/TemplateServiceSpecs.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ public override void BeforeEachSpec()
364364
}
365365

366366
[Fact]
367+
[WindowsOnly]
367368
public void should_generate_all_files_and_directories()
368369
{
369370
because();
@@ -383,7 +384,8 @@ public void should_generate_all_files_and_directories()
383384
MockLogger.MessagesFor(LogLevel.Info).Last().ShouldEqual(string.Format(@"Successfully generated Bob package specification files{0} at 'c:\chocolatey\Bob'", Environment.NewLine));
384385
}
385386

386-
[Fact]
387+
[Fact]
388+
[WindowsOnly]
387389
public void should_generate_all_files_and_directories_even_with_outputdirectory()
388390
{
389391
config.OutputDirectory = "c:\\packages";

‎src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,9 @@ private static void set_environment_options(ChocolateyConfiguration config)
439439

440440
public static void set_environment_variables(ChocolateyConfiguration config)
441441
{
442+
Environment.SetEnvironmentVariable("ChocolateyPackageInstallLocation", null);
443+
Environment.SetEnvironmentVariable("ChocolateyInstallerType", null);
444+
442445
Environment.SetEnvironmentVariable(ApplicationParameters.ChocolateyInstallEnvironmentVariableName, ApplicationParameters.InstallLocation);
443446
Environment.SetEnvironmentVariable("CHOCOLATEY_VERSION", config.Information.ChocolateyVersion);
444447
Environment.SetEnvironmentVariable("CHOCOLATEY_VERSION_PRODUCT", config.Information.ChocolateyProductVersion);
@@ -474,7 +477,7 @@ public static void set_environment_variables(ChocolateyConfiguration config)
474477
Environment.SetEnvironmentVariable("https_proxy", "{0}{1}".format_with(proxyCreds, config.Proxy.Location));
475478
Environment.SetEnvironmentVariable("chocolateyProxyLocation", config.Proxy.Location);
476479
}
477-
480+
478481
if (config.Features.UsePowerShellHost) Environment.SetEnvironmentVariable("ChocolateyPowerShellHost", "true");
479482
if (config.Force) Environment.SetEnvironmentVariable("ChocolateyForce", "true");
480483
}

‎src/chocolatey/infrastructure.app/domain/RegistryApplicationKey.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public class RegistryApplicationKey : IEquatable<RegistryApplicationKey>
6363
public bool NoRepair { get; set; }
6464
public string ReleaseType { get; set; } //hotfix, securityupdate, update rollup, servicepack
6565
public string ParentKeyName { get; set; }
66+
public string LocalPackage { get; set; }
6667

6768
/// <summary>
6869
/// Is an application listed in ARP (Programs and Features)?

0 commit comments

Comments
 (0)