From 506527e6b6d7f40714ff07afdc2e75bcc1375acb Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Thu, 30 Mar 2017 21:40:55 -0500 Subject: [PATCH 01/11] (doc) remove unfixed issue --- CHANGELOG.md | 1 - nuget/chocolatey/chocolatey.nuspec | 1 - 2 files changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cca154aef2..987cf2cda5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,6 @@ This covers changes for the "chocolatey" and "chocolatey.lib" packages, which ar ### BUG FIXES * Fix - Start-ChocolateyProcessAsAdmin errors when running PowerShell scripts - see [#1220](https://github.com/chocolatey/choco/issues/1220) - * Fix - Chocolatey timed out immediately when execution timeout was infinite - see [#1224](https://github.com/chocolatey/choco/issues/1224) ### IMPROVEMENTS diff --git a/nuget/chocolatey/chocolatey.nuspec b/nuget/chocolatey/chocolatey.nuspec index 857c8173d8..56a4c5d8a6 100644 --- a/nuget/chocolatey/chocolatey.nuspec +++ b/nuget/chocolatey/chocolatey.nuspec @@ -60,7 +60,6 @@ See all - https://github.com/chocolatey/choco/blob/stable/CHANGELOG.md ### BUG FIXES * Fix - Start-ChocolateyProcessAsAdmin errors when running PowerShell scripts - see [#1220](https://github.com/chocolatey/choco/issues/1220) - * Fix - Chocolatey timed out immediately when execution timeout was infinite - see [#1224](https://github.com/chocolatey/choco/issues/1224) ### IMPROVEMENTS From f6d6ad4a52a1d359714cb708dfaf6284bbc14929 Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Thu, 30 Mar 2017 21:52:58 -0500 Subject: [PATCH 02/11] (maint) change version to beta for next release --- .uppercut | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.uppercut b/.uppercut index 6ef7e36d59..29368f7376 100644 --- a/.uppercut +++ b/.uppercut @@ -17,10 +17,10 @@ - + - - + + From 4634c4329e99abc4cf0ba93a925472508d76b904 Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Thu, 30 Mar 2017 22:03:06 -0500 Subject: [PATCH 03/11] (GH-1224) longer timeouts - this time with feeling When the wait time is 0, do not set a timeout on the execute task.Wait. --- src/chocolatey/infrastructure/commands/Execute.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/chocolatey/infrastructure/commands/Execute.cs b/src/chocolatey/infrastructure/commands/Execute.cs index 58777b163d..f19879017f 100644 --- a/src/chocolatey/infrastructure/commands/Execute.cs +++ b/src/chocolatey/infrastructure/commands/Execute.cs @@ -68,7 +68,16 @@ public T command(Func function, T timeoutDefaultValue) cancelToken.Token.ThrowIfCancellationRequested(); var task = Task.Factory.StartNew(function, cancelToken.Token); //,TaskCreationOptions.LongRunning| TaskCreationOptions.AttachedToParent); - task.Wait(_timespan); + if (_timespan.TotalSeconds < 1d) + { + // 0 means infinite + task.Wait(); + } + else + { + task.Wait(_timespan); + } + if (task.IsCompleted) return task.Result; cancelToken.Cancel(); From 146bfbc0156bacf0a832f0e9e19b6173b4a3ef55 Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Mon, 3 Apr 2017 18:16:45 -0500 Subject: [PATCH 04/11] (GH-1225) Ensure scripts are UTF-8 BOM PowerShell is not very good at telling the difference between ANSI and UTF8 w/out BOM, so PowerShell scripts are not able to be verified by what is built into PowerShell authenticode verification if they use UTF8 no BOM with unicode characters. This follows up on #1209 where it was discovered that the authenticode verification would not work with LF line endings. That was resolved and later a unicode character (copyright) was introduced, which broke the functionality again. Convert all scripts to UTF8 w/BOM. --- nuget/chocolatey/tools/chocolateyInstall.ps1 | 2 +- nuget/chocolatey/tools/chocolateysetup.psm1 | 2 +- nuget/chocolatey/tools/init.ps1 | 2 +- src/chocolatey.resources/helpers/ChocolateyTabExpansion.ps1 | 2 +- src/chocolatey.resources/helpers/chocolateyInstaller.psm1 | 2 +- src/chocolatey.resources/helpers/chocolateyProfile.psm1 | 2 +- src/chocolatey.resources/helpers/chocolateyScriptRunner.ps1 | 2 +- src/chocolatey.resources/helpers/functions/Format-FileSize.ps1 | 2 +- .../helpers/functions/Get-CheckSumValid.ps1 | 2 +- .../helpers/functions/Get-ChocolateyUnzip.ps1 | 2 +- .../helpers/functions/Get-ChocolateyWebFile.ps1 | 2 +- .../helpers/functions/Get-EnvironmentVariable.ps1 | 2 +- .../helpers/functions/Get-EnvironmentVariableNames.ps1 | 2 +- src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 | 2 +- .../helpers/functions/Get-OSArchitectureWidth.ps1 | 2 +- .../helpers/functions/Get-ToolsLocation.ps1 | 2 +- src/chocolatey.resources/helpers/functions/Get-UACEnabled.ps1 | 2 +- .../helpers/functions/Get-UninstallRegistryKey.ps1 | 2 +- .../helpers/functions/Get-VirusCheckValid.ps1 | 2 +- src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 | 2 +- src/chocolatey.resources/helpers/functions/Get-WebFileName.ps1 | 2 +- src/chocolatey.resources/helpers/functions/Get-WebHeaders.ps1 | 2 +- src/chocolatey.resources/helpers/functions/Install-BinFile.ps1 | 2 +- .../helpers/functions/Install-ChocolateyDesktopLink.ps1 | 2 +- .../helpers/functions/Install-ChocolateyEnvironmentVariable.ps1 | 2 +- .../helpers/functions/Install-ChocolateyExplorerMenuItem.ps1 | 2 +- .../helpers/functions/Install-ChocolateyFileAssociation.ps1 | 2 +- .../helpers/functions/Install-ChocolateyInstallPackage.ps1 | 2 +- .../helpers/functions/Install-ChocolateyPackage.ps1 | 2 +- .../helpers/functions/Install-ChocolateyPath.ps1 | 2 +- .../helpers/functions/Install-ChocolateyPinnedTaskBarItem.ps1 | 2 +- .../helpers/functions/Install-ChocolateyPowershellCommand.ps1 | 2 +- .../helpers/functions/Install-ChocolateyShortcut.ps1 | 2 +- .../helpers/functions/Install-ChocolateyVsixPackage.ps1 | 2 +- .../helpers/functions/Install-ChocolateyZipPackage.ps1 | 2 +- src/chocolatey.resources/helpers/functions/Install-Vsix.ps1 | 2 +- .../helpers/functions/Set-EnvironmentVariable.ps1 | 2 +- .../helpers/functions/Set-PowerShellExitCode.ps1 | 2 +- .../helpers/functions/Start-ChocolateyProcessAsAdmin.ps1 | 2 +- .../helpers/functions/Test-ProcessAdminRights.ps1 | 2 +- .../helpers/functions/UnInstall-ChocolateyZipPackage.ps1 | 2 +- .../helpers/functions/Uninstall-BinFile.ps1 | 2 +- .../functions/Uninstall-ChocolateyEnvironmentVariable.ps1 | 2 +- .../helpers/functions/Uninstall-ChocolateyPackage.ps1 | 2 +- .../helpers/functions/Update-SessionEnvironment.ps1 | 2 +- .../helpers/functions/Write-ChocolateyFailure.ps1 | 2 +- .../helpers/functions/Write-ChocolateySuccess.ps1 | 2 +- .../helpers/functions/Write-FileUpdateLog.ps1 | 2 +- .../helpers/functions/Write-FunctionCallLogMessage.ps1 | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/nuget/chocolatey/tools/chocolateyInstall.ps1 b/nuget/chocolatey/tools/chocolateyInstall.ps1 index 45bd4c74c6..4e2d6ae883 100644 --- a/nuget/chocolatey/tools/chocolateyInstall.ps1 +++ b/nuget/chocolatey/tools/chocolateyInstall.ps1 @@ -1,4 +1,4 @@ -$toolsPath = (Split-Path -parent $MyInvocation.MyCommand.Definition) +$toolsPath = (Split-Path -parent $MyInvocation.MyCommand.Definition) # ensure module loading preference is on $PSModuleAutoLoadingPreference = "All"; diff --git a/nuget/chocolatey/tools/chocolateysetup.psm1 b/nuget/chocolatey/tools/chocolateysetup.psm1 index 7430a98c66..3717ed14aa 100644 --- a/nuget/chocolatey/tools/chocolateysetup.psm1 +++ b/nuget/chocolatey/tools/chocolateysetup.psm1 @@ -1,4 +1,4 @@ -$thisScriptFolder = (Split-Path -parent $MyInvocation.MyCommand.Definition) +$thisScriptFolder = (Split-Path -parent $MyInvocation.MyCommand.Definition) $chocInstallVariableName = "ChocolateyInstall" $sysDrive = $env:SystemDrive $tempDir = $env:TEMP diff --git a/nuget/chocolatey/tools/init.ps1 b/nuget/chocolatey/tools/init.ps1 index 0ef329b827..7694f97cb8 100644 --- a/nuget/chocolatey/tools/init.ps1 +++ b/nuget/chocolatey/tools/init.ps1 @@ -1,4 +1,4 @@ -param($installPath, $toolsPath, $package, $project) +param($installPath, $toolsPath, $package, $project) $modules = Get-ChildItem $ToolsPath -Filter *.psm1 $modules | ForEach-Object { import-module -name $_.FullName } diff --git a/src/chocolatey.resources/helpers/ChocolateyTabExpansion.ps1 b/src/chocolatey.resources/helpers/ChocolateyTabExpansion.ps1 index 1964e0ab45..abcf287c2b 100644 --- a/src/chocolatey.resources/helpers/ChocolateyTabExpansion.ps1 +++ b/src/chocolatey.resources/helpers/ChocolateyTabExpansion.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2011 - 2017 RealDimensions Software, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/chocolatey.resources/helpers/chocolateyInstaller.psm1 b/src/chocolatey.resources/helpers/chocolateyInstaller.psm1 index f62a70940d..8bb74e3367 100644 --- a/src/chocolatey.resources/helpers/chocolateyInstaller.psm1 +++ b/src/chocolatey.resources/helpers/chocolateyInstaller.psm1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/chocolateyProfile.psm1 b/src/chocolatey.resources/helpers/chocolateyProfile.psm1 index 1672b03453..e12fd2e89d 100644 --- a/src/chocolatey.resources/helpers/chocolateyProfile.psm1 +++ b/src/chocolatey.resources/helpers/chocolateyProfile.psm1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2011 - 2017 RealDimensions Software, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/chocolatey.resources/helpers/chocolateyScriptRunner.ps1 b/src/chocolatey.resources/helpers/chocolateyScriptRunner.ps1 index 5cdfee21c0..a27e771fb3 100644 --- a/src/chocolatey.resources/helpers/chocolateyScriptRunner.ps1 +++ b/src/chocolatey.resources/helpers/chocolateyScriptRunner.ps1 @@ -1,4 +1,4 @@ -param( +param( [alias("ia","installArgs")][string] $installArguments = '', [alias("o","override","overrideArguments","notSilent")] [switch] $overrideArgs = $false, diff --git a/src/chocolatey.resources/helpers/functions/Format-FileSize.ps1 b/src/chocolatey.resources/helpers/functions/Format-FileSize.ps1 index e2c3d50873..7b549f4dc3 100644 --- a/src/chocolatey.resources/helpers/functions/Format-FileSize.ps1 +++ b/src/chocolatey.resources/helpers/functions/Format-FileSize.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2011 - 2017 RealDimensions Software, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 b/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 index 383aa9ef6a..9fafa4995b 100644 --- a/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-CheckSumValid.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1 b/src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1 index 68241c972f..94bd43a747 100644 --- a/src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-ChocolateyUnzip.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 index 852754d710..2aad543f8a 100644 --- a/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-ChocolateyWebFile.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Get-EnvironmentVariable.ps1 b/src/chocolatey.resources/helpers/functions/Get-EnvironmentVariable.ps1 index 761142e273..e7d9d35187 100644 --- a/src/chocolatey.resources/helpers/functions/Get-EnvironmentVariable.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-EnvironmentVariable.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Get-EnvironmentVariableNames.ps1 b/src/chocolatey.resources/helpers/functions/Get-EnvironmentVariableNames.ps1 index 7385914384..d9e8248e57 100644 --- a/src/chocolatey.resources/helpers/functions/Get-EnvironmentVariableNames.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-EnvironmentVariableNames.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 index 5892bc4731..61cc1ff93d 100644 --- a/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-FtpFile.ps1 @@ -1,4 +1,4 @@ -## Get-FtpFile +## Get-FtpFile ############################################################################################################## ## Downloads a file from ftp ## Some code from http://stackoverflow.com/questions/265339/whats-the-best-way-to-automate-secure-ftp-in-powershell diff --git a/src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1 b/src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1 index 5576b40478..4d7456f1cc 100644 --- a/src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-OSArchitectureWidth.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Get-ToolsLocation.ps1 b/src/chocolatey.resources/helpers/functions/Get-ToolsLocation.ps1 index d480f4d23e..4735537156 100644 --- a/src/chocolatey.resources/helpers/functions/Get-ToolsLocation.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-ToolsLocation.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2011 - 2017 RealDimensions Software, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/chocolatey.resources/helpers/functions/Get-UACEnabled.ps1 b/src/chocolatey.resources/helpers/functions/Get-UACEnabled.ps1 index 0e96a95b6f..86f6996cb6 100644 --- a/src/chocolatey.resources/helpers/functions/Get-UACEnabled.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-UACEnabled.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Get-UninstallRegistryKey.ps1 b/src/chocolatey.resources/helpers/functions/Get-UninstallRegistryKey.ps1 index b28d2c2608..1f3d5f90f1 100644 --- a/src/chocolatey.resources/helpers/functions/Get-UninstallRegistryKey.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-UninstallRegistryKey.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2011 - 2017 RealDimensions Software, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/chocolatey.resources/helpers/functions/Get-VirusCheckValid.ps1 b/src/chocolatey.resources/helpers/functions/Get-VirusCheckValid.ps1 index 11acee554f..4fb306c96e 100644 --- a/src/chocolatey.resources/helpers/functions/Get-VirusCheckValid.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-VirusCheckValid.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 index ce43ece54c..9a33819119 100644 --- a/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 @@ -1,4 +1,4 @@ -# http://poshcode.org/417 +# http://poshcode.org/417 ## Get-WebFile (aka wget for PowerShell) ############################################################################################################## ## Downloads a file or page from the web diff --git a/src/chocolatey.resources/helpers/functions/Get-WebFileName.ps1 b/src/chocolatey.resources/helpers/functions/Get-WebFileName.ps1 index 215f8697d9..cb395b1e35 100644 --- a/src/chocolatey.resources/helpers/functions/Get-WebFileName.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-WebFileName.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2011 - 2017 RealDimensions Software, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/chocolatey.resources/helpers/functions/Get-WebHeaders.ps1 b/src/chocolatey.resources/helpers/functions/Get-WebHeaders.ps1 index f9df06a593..c07b7f84b7 100644 --- a/src/chocolatey.resources/helpers/functions/Get-WebHeaders.ps1 +++ b/src/chocolatey.resources/helpers/functions/Get-WebHeaders.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-BinFile.ps1 b/src/chocolatey.resources/helpers/functions/Install-BinFile.ps1 index 54f437964a..972b432fca 100644 --- a/src/chocolatey.resources/helpers/functions/Install-BinFile.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-BinFile.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyDesktopLink.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyDesktopLink.ps1 index aaf5d67c89..c9e1472c88 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyDesktopLink.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyDesktopLink.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyEnvironmentVariable.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyEnvironmentVariable.ps1 index 3208e97a9b..1c58517d65 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyEnvironmentVariable.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyEnvironmentVariable.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyExplorerMenuItem.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyExplorerMenuItem.ps1 index f265f1ba3d..372377b81f 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyExplorerMenuItem.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyExplorerMenuItem.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyFileAssociation.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyFileAssociation.ps1 index dc1a882013..eac8c4920f 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyFileAssociation.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyFileAssociation.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 index bec76defd4..848e9f9860 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 index 77ba13c5ab..7578dcdbbb 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPath.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPath.ps1 index 896e1a22f9..39bec513a2 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPath.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPath.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPinnedTaskBarItem.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPinnedTaskBarItem.ps1 index 9520a4075b..d7d9da72e1 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPinnedTaskBarItem.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPinnedTaskBarItem.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPowershellCommand.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPowershellCommand.ps1 index c42710744d..4ff8e616b4 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyPowershellCommand.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyPowershellCommand.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyShortcut.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyShortcut.ps1 index e97a8d0fd7..53eff1e584 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyShortcut.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyShortcut.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 index ac794d938a..9c74ac57b9 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyVsixPackage.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 index 45d1d52e98..cf2cede758 100644 --- a/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-ChocolateyZipPackage.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Install-Vsix.ps1 b/src/chocolatey.resources/helpers/functions/Install-Vsix.ps1 index ac51c845aa..12cd128108 100644 --- a/src/chocolatey.resources/helpers/functions/Install-Vsix.ps1 +++ b/src/chocolatey.resources/helpers/functions/Install-Vsix.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Set-EnvironmentVariable.ps1 b/src/chocolatey.resources/helpers/functions/Set-EnvironmentVariable.ps1 index 9f4c38fd5e..19e5830543 100644 --- a/src/chocolatey.resources/helpers/functions/Set-EnvironmentVariable.ps1 +++ b/src/chocolatey.resources/helpers/functions/Set-EnvironmentVariable.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Set-PowerShellExitCode.ps1 b/src/chocolatey.resources/helpers/functions/Set-PowerShellExitCode.ps1 index cc8f2fac56..418fe7f30e 100644 --- a/src/chocolatey.resources/helpers/functions/Set-PowerShellExitCode.ps1 +++ b/src/chocolatey.resources/helpers/functions/Set-PowerShellExitCode.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2011 - 2017 RealDimensions Software, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1 b/src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1 index 9506afbe3f..282bc98c99 100644 --- a/src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1 +++ b/src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Test-ProcessAdminRights.ps1 b/src/chocolatey.resources/helpers/functions/Test-ProcessAdminRights.ps1 index a58a17dd43..85717495ac 100644 --- a/src/chocolatey.resources/helpers/functions/Test-ProcessAdminRights.ps1 +++ b/src/chocolatey.resources/helpers/functions/Test-ProcessAdminRights.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/UnInstall-ChocolateyZipPackage.ps1 b/src/chocolatey.resources/helpers/functions/UnInstall-ChocolateyZipPackage.ps1 index fafb977ca2..15eeb7ab2c 100644 --- a/src/chocolatey.resources/helpers/functions/UnInstall-ChocolateyZipPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/UnInstall-ChocolateyZipPackage.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Uninstall-BinFile.ps1 b/src/chocolatey.resources/helpers/functions/Uninstall-BinFile.ps1 index ed67a6576f..7a41dca1e0 100644 --- a/src/chocolatey.resources/helpers/functions/Uninstall-BinFile.ps1 +++ b/src/chocolatey.resources/helpers/functions/Uninstall-BinFile.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyEnvironmentVariable.ps1 b/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyEnvironmentVariable.ps1 index 350d406a6b..965b5007f3 100644 --- a/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyEnvironmentVariable.ps1 +++ b/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyEnvironmentVariable.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2011 - 2017 RealDimensions Software, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyPackage.ps1 b/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyPackage.ps1 index 186907b004..126ec54c22 100644 --- a/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyPackage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Uninstall-ChocolateyPackage.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Update-SessionEnvironment.ps1 b/src/chocolatey.resources/helpers/functions/Update-SessionEnvironment.ps1 index 7859197b01..74d304356f 100644 --- a/src/chocolatey.resources/helpers/functions/Update-SessionEnvironment.ps1 +++ b/src/chocolatey.resources/helpers/functions/Update-SessionEnvironment.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Write-ChocolateyFailure.ps1 b/src/chocolatey.resources/helpers/functions/Write-ChocolateyFailure.ps1 index 22804d9303..4b32d01a7a 100644 --- a/src/chocolatey.resources/helpers/functions/Write-ChocolateyFailure.ps1 +++ b/src/chocolatey.resources/helpers/functions/Write-ChocolateyFailure.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Write-ChocolateySuccess.ps1 b/src/chocolatey.resources/helpers/functions/Write-ChocolateySuccess.ps1 index c167918653..e05efec19c 100644 --- a/src/chocolatey.resources/helpers/functions/Write-ChocolateySuccess.ps1 +++ b/src/chocolatey.resources/helpers/functions/Write-ChocolateySuccess.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Write-FileUpdateLog.ps1 b/src/chocolatey.resources/helpers/functions/Write-FileUpdateLog.ps1 index 7ecb4d1455..b80e349b2a 100644 --- a/src/chocolatey.resources/helpers/functions/Write-FileUpdateLog.ps1 +++ b/src/chocolatey.resources/helpers/functions/Write-FileUpdateLog.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2015 - 2017 RealDimensions Software, LLC # Copyright © 2011 - 2015 RealDimensions Software, LLC & original authors/contributors from https://github.com/chocolatey/chocolatey # diff --git a/src/chocolatey.resources/helpers/functions/Write-FunctionCallLogMessage.ps1 b/src/chocolatey.resources/helpers/functions/Write-FunctionCallLogMessage.ps1 index b0e90bf590..79969388a7 100644 --- a/src/chocolatey.resources/helpers/functions/Write-FunctionCallLogMessage.ps1 +++ b/src/chocolatey.resources/helpers/functions/Write-FunctionCallLogMessage.ps1 @@ -1,4 +1,4 @@ -# Copyright © 2017 Chocolatey Software, Inc. +# Copyright © 2017 Chocolatey Software, Inc. # Copyright © 2011 - 2017 RealDimensions Software, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); From e3cb961a7ccc456a8580ade545caea8b589aeed8 Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Mon, 3 Apr 2017 23:02:01 -0500 Subject: [PATCH 05/11] (doc) update shimgen license --- .../tools/shimgen.license.txt | 45 +++++++++++++------ 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/src/chocolatey.resources/tools/shimgen.license.txt b/src/chocolatey.resources/tools/shimgen.license.txt index 43b866e13d..d3b782ae36 100644 --- a/src/chocolatey.resources/tools/shimgen.license.txt +++ b/src/chocolatey.resources/tools/shimgen.license.txt @@ -1,29 +1,48 @@ Shim Generator - shimgen.exe -Copyright (C) 2013 - Present RealDimensions Software, LLC ("RDS") +Copyright (C) 2013 - 2017 RealDimensions Software, LLC ("RDS") =================================================================== Grant of License =================================================================== -You may use Shim Generator ("shimgen.exe") only with the official Chocolatey client. +You may use Shim Generator ("shimgen.exe") only with the official Chocolatey +client. The use of shimgen.exe for any other reason is strictly prohibited. -The use of shimgen.exe for any other reason is strictly prohibited. +If you would like to use this software for any other reason, you must obtain a +personal or commercial license to do so. To do that you must contact RDS at +ferventcoder.com. -If you would like to use this software for any other reason, you must obtain a personal or commercial license to do so. To do that you must contact RDS at ferventcoder.com. - -This software is not free to distribute. If you would like to distribute this software, you must receive written permission from the software owner. +This software is not free to distribute apart from the Chocolatey client. If you +would like to distribute this software outside of use through Chocolatey, you +must receive written permission from the software owner. =================================================================== End-User License Agreement =================================================================== EULA - Shim Generator -IMPORTANT- READ CAREFULLY: This RealDimensions Software ("RDS") End-User License Agreement ("EULA") is a legal agreement between you("End User") and RDS for all RDS products, controls, source code, demos, intermediate files, media, printed materials, and "online" or electronic documentation ("SOFTWARE PRODUCT(S)") contained with this distribution. - -RDS grants to you as an individual, a personal, nonexclusive license to install and use the SOFTWARE PRODUCT(S) for the sole purpose of use with the official chocolatey client. By installing, copying, or otherwise using the SOFTWARE PRODUCT(S), you agree to be bound by the terms of this EULA. If you do not agree to any part of the terms of this EULA, DO NOT INSTALL, USE, OR EVALUATE, ANY PART, FILE OR PORTION OF THE SOFTWARE PRODUCT(S). - -ALL SOFTWARE PRODUCT(S) are licensed not sold. If you are an individual, you must acquire an individual license for the SOFTWARE PRODUCT(S) from RDS or its authorized resellers. If you are an entity, you must acquire an individual license for each Developer End User and each Build Machine Running the SOFTWARE PRODUCT(S) within your organization from RDS or its authorized resellers. Both Virtual and Physical Build Machines running the SOFTWARE PRODUCT(S) must be counted in the SOFTWARE PRODUCT(S) licenses quantity of the organization. +IMPORTANT- READ CAREFULLY: This RealDimensions Software ("RDS") End-User License +Agreement ("EULA") is a legal agreement between you ("END USER") and RDS for all +RDS products, controls, source code, demos, intermediate files, media, printed +materials, and "online" or electronic documentation ("SOFTWARE PRODUCT(S)") +contained with this distribution. + +RDS grants to END USER as an individual, a personal, nonexclusive license to +install and use the SOFTWARE PRODUCT(S) for the sole purpose of use with the +official Chocolatey client. By installing, copying, or otherwise using the +SOFTWARE PRODUCT(S), END USER agrees to be bound by the terms of this EULA. If +END USER does not agree to any part of the terms of this EULA, DO NOT INSTALL, +USE, OR EVALUATE, ANY PART, FILE OR PORTION OF THE SOFTWARE PRODUCT(S). + +ALL SOFTWARE PRODUCT(S) are licensed not sold. If END USER is an individual, +END USER must acquire an individual license for the SOFTWARE PRODUCT(S) from RDS +or its authorized resellers. If END USER is an entity, END USER must acquire an +individual license for each machine running the SOFTWARE PRODUCT(S) within your +organization from RDS or its authorized resellers. Both Virtual and Physical +Machines running the SOFTWARE PRODUCT(S) must be counted in the SOFTWARE +PRODUCT(S) licenses quantity of the organization. =================================================================== Commercial / Personal Licensing =================================================================== -Shim Generator (shimgen.exe) is also offered under personal and commercial licenses. -You can learn more about this option by contacting RDS at http://ferventcoder.com +Shim Generator (shimgen.exe) is also offered under personal and commercial +licenses. You can learn more about this option by contacting RDS at +http://ferventcoder.com From 37b25b100083e9ee1bf7b47237f44e0ebbd34184 Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Mon, 3 Apr 2017 23:06:43 -0500 Subject: [PATCH 06/11] (GH-1209) update NOTICE Ensure NOTICE lists Chocolatey Software as the new copyright holder. --- NOTICE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 9dc47ac6a5..ad476f9400 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,5 @@ -Copyright 2011 - Present RealDimensions Software, LLC +# Copyright 2017 Chocolatey Software, Inc. +# Copyright 2011 - 2017 RealDimensions Software, LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 782a1cd228df548661e6c4eb5bb49b347025f85a Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Mon, 3 Apr 2017 23:08:34 -0500 Subject: [PATCH 07/11] (build) Ensure notice, license, credits for nuget The Chocolatey Package was getting the license copied, but the library was not. Ensure that it receives the licensing files as well. Add the notice and credits as outputs to that. --- .build.custom/nugetPrepare.post.step | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.build.custom/nugetPrepare.post.step b/.build.custom/nugetPrepare.post.step index b5fa4fc23f..898e6e739c 100644 --- a/.build.custom/nugetPrepare.post.step +++ b/.build.custom/nugetPrepare.post.step @@ -12,7 +12,7 @@ - + @@ -40,4 +40,18 @@ workingdir="${dirs.drop.nuget}${path.separator}chocolatey${path.separator}tools${path.separator}chocolateyInstall" commandline="${args.choco}" if="${platform::is-windows()}" /> + + + + + + + + + + + + + + From dc344c22141bdd96ed7ee6dfbfef95a6481934ff Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Mon, 3 Apr 2017 23:12:04 -0500 Subject: [PATCH 08/11] (GH-1209) update NOTICE Ensure NOTICE looks like what choco bakes in --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index ad476f9400..da57b99c7a 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ -# Copyright 2017 Chocolatey Software, Inc. -# Copyright 2011 - 2017 RealDimensions Software, LLC + Copyright (c) 2017 Chocolatey Software, Inc. + Copyright (c) 2011 - 2017 RealDimensions Software, LLC Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From fae13bf418503673357863ed02303a974dc20f85 Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Mon, 3 Apr 2017 23:13:12 -0500 Subject: [PATCH 09/11] (build) do not add license and notice Choco already unpacks the License file. It is the same text as the NOTICE file, so ensure that is is used and not overwritten. --- .build.custom/nugetPrepare.post.step | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.build.custom/nugetPrepare.post.step b/.build.custom/nugetPrepare.post.step index 898e6e739c..9862c8ad86 100644 --- a/.build.custom/nugetPrepare.post.step +++ b/.build.custom/nugetPrepare.post.step @@ -42,14 +42,6 @@ - - - - - - - - From 2d8fe154d4167008ef2b8050d522e31859dd7ca5 Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Mon, 3 Apr 2017 23:41:59 -0500 Subject: [PATCH 10/11] (doc) update CREDITS Ensure credits is set properly with licenses. --- docs/legal/CREDITS.md | 805 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 764 insertions(+), 41 deletions(-) diff --git a/docs/legal/CREDITS.md b/docs/legal/CREDITS.md index b37f3ba8b6..112e8795bc 100644 --- a/docs/legal/CREDITS.md +++ b/docs/legal/CREDITS.md @@ -1,38 +1,55 @@ -Chocolatey has been the thoughts and work of the following people: + -## Committers & Contributors +- [Committers & Contributors](#committers--contributors) + - [Committers](#committers) + - [Chocolatey Community Team](#chocolatey-community-team) + - [Contributors](#contributors) + - [Other Contributors](#other-contributors) +- [Third Party Licenses - Development](#third-party-licenses---development) +- [Third Party Licenses - Runtime](#third-party-licenses---runtime) + - [7-Zip](#7-zip) + - [AlphaFS](#alphafs) + - [Checksum](#checksum) + - [log4net](#log4net) + - [Microsoft.Web.Xdt](#microsoftwebxdt) + - [NuGet.Core (modified)](#nugetcore-modified) + - [Rhino.Licensing (modified)](#rhinolicensing-modified) + - [Rx (Reactive Extensions)](#rx-reactive-extensions) + - [Shim Generator (shimgen)](#shim-generator-shimgen) + - [SimpleInjector](#simpleinjector) -### Committers + -These are the committers to Chocolatey/Choco repositories: +## Committers & Contributors +Chocolatey has been the the thoughts, ideas, and work of a large community. While [Rob](https://github.com/ferventcoder) heads up direction and plays a primary role in development, there are several people that have really been a part of making Chocolatey what it is today. - * [Rob Reynolds](https://github.com/ferventcoder) - Creator of Chocolatey, committer, vision, direction, community feed moderator - * [Matt Wrock](https://github.com/mwrock) - Committer, Creator of BoxStarter, community feed moderator - * [Rich Siegel](https://github.com/rismoney) - Committer, Creator of Puppet provider - * [Gary Ewan Park](https://github.com/gep13) - Committer, Chocolatey GUI, community feed moderator -### Chocolatey Team +### Committers -The Chocolatey Team includes the committers and adds these fine folks: +These are the committers to Chocolatey/Choco repositories: -Order is by github username: + * [Core Development Team](https://github.com/orgs/chocolatey/teams/developers) + * [Rob Reynolds](https://github.com/ferventcoder) - Creator of Chocolatey, committer, vision, direction, community feed moderator + * [Gary Ewan Park](https://github.com/gep13) - Committer, Chocolatey GUI, community feed moderator + * [Matt Wrock](https://github.com/mwrock) - Committer, Creator of BoxStarter, community feed moderator + * [Rich Siegel](https://github.com/rismoney) - Committer, Creator of Puppet provider + * [Richard Simpson](https://github.com/RichiCoder1) - created and maintains the new Chocolatey GUI - * [Anthony Mastrean](https://github.com/AnthonyMastrean) - contributions, community feed moderator - * [Guilhem Lettron](https://github.com/guilhem) - Created and maintains Chef Cookbook (LWRP) - * [Ethan J. Brown](https://github.com/Iristyle) - contributions, github.io work - * [Jakub Berezanski](https://github.com/jberezanski) - contributions, community feed moderator - * [Sander AKA Redsandro](https://github.com/Redsandro) - Community feed moderator - * [Richard Simpson](https://github.com/RichiCoder1) - Created and maintains the new Chocolatey GUI - * [Simon Cropp](https://github.com/SimonCropp) - contributions, community feed moderator - * [TomOne](https://github.com/TomOne) - Guidelines, policies, contributions, community feed moderator - * [Justin Dearing](https://github.com/zippy1981) - contributions, community feed moderator +### Chocolatey Community Team -#### Emeritus: +The Chocolatey Community Team includes the committers and adds these fine folks: - * [Alan Stevens](https://github.com/alanstevens) - Contributed ideas on direction early on +* [Community Package Repository Moderation Team](https://github.com/orgs/chocolatey/teams/community-moderators) +* [Chocolatey Core Community Maintainers Team](https://github.com/orgs/chocolatey/teams/community-maintainers) ### Contributors + * [choco.exe](https://github.com/chocolatey/choco/graphs/contributors) + * [Original Chocolatey - POSH choco](https://github.com/chocolatey/chocolatey/graphs/contributors) + * [Community Feed / Chocolatey.org](https://github.com/chocolatey/chocolatey.org/graphs/contributors) + +### Other Contributors + **NEEDS UPDATED** * Nekresh (https://github.com/nekresh) - Contributing code and ideas on direction @@ -41,23 +58,7 @@ Order is by github username: * Marcel Hoyer - suggestions on making this stuff work without administrative access to a machine * Jason Jarrett (https://github.com/staxmanade) - contributing code and ideas -#### Other Contributors - - * [choco.exe](https://github.com/chocolatey/choco/graphs/contributors) - * [Original Chocolatey - POSH choco](https://github.com/chocolatey/chocolatey/graphs/contributors) - * [Community Feed / Chocolatey.org](https://github.com/chocolatey/chocolatey.org/graphs/contributors) - -## Frameworks - -**NEEDS URL INFO AND SMALL BLURB** - -Choco uses the following awesome frameworks (in no particular order): - - * NuGet.Core - * log4Net - * Rhino.Licensing - * Rx - * SimpleInjector +## Third Party Licenses - Development Choco is built, tested and analyzed with the following fantastic frameworks (in no particular order): @@ -68,6 +69,7 @@ Choco is built, tested and analyzed with the following fantastic frameworks (in Choco is tested and analyzed with the following rockstar frameworks (in no particular order): + * bdddoc * NUnit * Moq * TinySpec @@ -80,6 +82,727 @@ We would like to credit other super sweet tools/frameworks that aid in the devel * ReSharper * NuGet Framework +## Third Party Licenses - Runtime + +Chocolatey open source uses a number of 3rd party components. Their details are below. + + + +- [7-Zip](#7-zip) +- [AlphaFS](#alphafs) +- [Checksum](#checksum) +- [log4net](#log4net) +- [Microsoft.Web.Xdt](#microsoftwebxdt) +- [NuGet.Core (modified)](#nugetcore-modified) +- [Rhino.Licensing (modified)](#rhinolicensing-modified) +- [Rx (Reactive Extensions)](#rx-reactive-extensions) +- [Shim Generator (shimgen)](#shim-generator-shimgen) +- [SimpleInjector](#simpleinjector) + + + +### 7-Zip +Chocolatey uses [7-Zip](http://www.7-zip.org/) for uncompressing archives. [License terms](http://www.7-zip.org/license.txt): + +~~~ + 7-Zip + + License for use and distribution + -------------------------------- + + 7-Zip Copyright (C) 1999-2016 Igor Pavlov. + + Licenses for files are: + + 1) 7z.dll: GNU LGPL + unRAR restriction + 2) All other files: GNU LGPL + + The GNU LGPL + unRAR restriction means that you must follow both + GNU LGPL rules and unRAR restriction rules. + + + Note: + You can use 7-Zip on any computer, including a computer in a commercial + organization. You don't need to register or pay for 7-Zip. + + + GNU LGPL information + -------------------- + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You can receive a copy of the GNU Lesser General Public License from + http://www.gnu.org/ + + + unRAR restriction + ----------------- + + The decompression engine for RAR archives was developed using source + code of unRAR program. + All copyrights to original unRAR code are owned by Alexander Roshal. + + The license for original unRAR code has the following restriction: + + The unRAR sources cannot be used to re-create the RAR compression algorithm, + which is proprietary. Distribution of modified unRAR sources in separate form + or as a part of other software is permitted, provided that it is clearly + stated in the documentation and source comments that the code may + not be used to develop a RAR (WinRAR) compatible archiver. + + + -- + Igor Pavlov + +~~~ + +### AlphaFS +Chocolatey uses [AlphaFS](https://github.com/alphaleonis/AlphaFS) for long file paths. [License terms](https://github.com/alphaleonis/AlphaFS/blob/7e597b58a5109ee820766a176ffa489c1411b6aa/LICENSE.md): + +~~~ + The MIT License (MIT) + ===================== + + Copyright (c) 2008-2016 Peter Palotas, Jeffrey Jangli, Alexandr Normuradov + + Permission is hereby granted, free of charge, to any person obtaining a copy of this + software and associated documentation files (the "Software"), to deal in the Software + without restriction, including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to + whom the Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all copies or + substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING + BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +~~~ + +### Checksum +Chocolatey uses [Checksum](https://github.com/ferventcoder/checksum) to determine checksums. [License terms](https://github.com/ferventcoder/checksum/blob/e6f5645610c7bc15084b48f69d4cdb056106f956/LICENSE): + +~~~ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + +~~~ + +### log4net +Chocolatey uses [log4net](http://logging.apache.org/log4net/) for logging. [License terms](http://logging.apache.org/log4net/license.html): + +~~~ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS +~~~ + +### Microsoft.Web.Xdt +Chocolatey uses [Microsoft.Web.Xdt](https://www.nuget.org/packages/Microsoft.Web.xdt) to perform Xml Document Transformation. It is also a requirement of NuGet.Core. [License terms](https://www.microsoft.com/web/webpi/eula/microsoft_web_xmltransform.htm): + +~~~ + MICROSOFT SOFTWARE LICENSE TERMS + + MICROSOFT.WEB.XDT + + These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft + + · updates, + + · supplements, + + · Internet-based services, and + + · support services + + for this software, unless other terms accompany those items. If so, those terms apply. + + By using the software, you accept these terms. If you do not accept them, do not use the software. + + If you comply with these license terms, you have the perpetual rights below. + + 1. INSTALLATION AND USE RIGHTS. You may install and use any number of copies of the software on your devices. + + 2. ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. + + a. Distributable Code. The software contains code that you are permitted to distribute in programs you develop if you comply with the terms below. + + i. Right to Use and Distribute. You may copy and distribute the object code form of Microsoft.Web.XmlTransform.dll file. + + · Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs. + + ii.Distribution Requirements. For any Distributable Code you distribute, you must + + · add significant primary functionality to it in your programs; + + · require distributors and external end users to agree to terms that protect it at least as much as this agreement; + + · display your valid copyright notice on your programs; and + + · indemnify, defend, and hold harmless Microsoft from any claims, including attorneys’ fees, related to the distribution or use of your programs. + + iii. Distribution Restrictions. You may not + + · alter any copyright, trademark or patent notice in the Distributable Code; + + · use Microsoft’s trademarks in your programs’ names or in a way that suggests your programs come from or are endorsed by Microsoft; + + · distribute Distributable Code to run on a platform other than the Windows platform; + + · include Distributable Code in malicious, deceptive or unlawful programs; or + + · modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that + + · the code be disclosed or distributed in source code form; or + + · others have the right to modify it. + + 3. SCOPE OF LICENSE. The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not + + · work around any technical limitations in the software; + + · reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation; + + · make more copies of the software than specified in this agreement or allowed by applicable law, despite this limitation; + + · publish the software for others to copy; + + · rent, lease or lend the software; or + + · transfer the software or this agreement to any third party. + + 4. BACKUP COPY. You may make one backup copy of the software. You may use it only to reinstall the software. + + 5. DOCUMENTATION. Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes. + + 6. EXPORT RESTRICTIONS. The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see www.microsoft.com/exporting. + + 7. SUPPORT SERVICES. Because this software is “as is,” we may not provide support services for it. + + 8. ENTIRE AGREEMENT. This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services. + + 9. APPLICABLE LAW. + + a. United States. If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort. + + b. Outside the United States. If you acquired the software in any other country, the laws of that country apply. + + 10. LEGAL EFFECT. This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so. + + 11. DISCLAIMER OF WARRANTY. The software is licensed “as-is.” You bear the risk of using it. Microsoft gives no express warranties, guarantees or conditions. You may have additional consumer rights or statutory guarantees under your local laws which this agreement cannot change. To the extent permitted under your local laws, Microsoft excludes the implied warranties of merchantability, fitness for a particular purpose and non-infringement. + + FOR AUSTRALIA – You have statutory guarantees under the Australian Consumer Law and nothing in these terms is intended to affect those rights. + + 12. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. You can recover from Microsoft and its suppliers only direct damages up to U.S. $5.00. You cannot recover any other damages, including consequential, lost profits, special, indirect or incidental damages. + + This limitation applies to + + · anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and + + · claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law. + + It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages. +~~~ + +### NuGet.Core (modified) +Chocolatey uses [NuGet.Core](https://github.com/NuGet/NuGet2) [(modified)](https://github.com/chocolatey/nuget-chocolatey) to work with packaging. [License terms](https://github.com/NuGet/NuGet2/blob/c3d1027a51b31fd0c41e9abbe90810cf1c924c9f/COPYRIGHT.txt): + +~~~ + Copyright 2010-2014 Outercurve Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +~~~ + +### Rhino.Licensing (modified) +Chocolatey uses [Rhino.Licensing](https://github.com/ayende/rhino-licensing) [(modified)](https://github.com/ferventcoder/rhino-licensing) to work with licensing. [License terms](https://github.com/ayende/rhino-licensing/blob/1fc90c984b0c3012465a73afae0a53492c969eb5/license.txt): + +~~~ + Copyright (c) 2005 - 2009 Ayende Rahien (ayende@ayende.com) + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of Ayende Rahien nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +~~~ + +### Rx (Reactive Extensions) +Chocolatey uses [Rx](http://reactivex.io/) for schedules and internal messaging. [License terms](https://github.com/Reactive-Extensions/Rx.NET/blob/5003248b99f8bf4afc2d4f7570b5789cedda9155/LICENSE): + +~~~ + Copyright (c) .NET Foundation and Contributors + All Rights Reserved + + Licensed under the Apache License, Version 2.0 (the "License"); you + may not use this file except in compliance with the License. You may + obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing permissions + and limitations under the License. +~~~ + +### Shim Generator (shimgen) +Chocolatey uses [shimgen](https://github.com/chocolatey/shimgen) to generate shim executables that call the original binaries. [License terms](https://github.com/chocolatey/choco/blob/782a1cd228df548661e6c4eb5bb49b347025f85a/src/chocolatey.resources/tools/shimgen.license.txt): + +~~~ + Shim Generator - shimgen.exe + Copyright (C) 2013 - 2017 RealDimensions Software, LLC ("RDS") + =================================================================== + Grant of License + =================================================================== + You may use Shim Generator ("shimgen.exe") only with the official Chocolatey + client. The use of shimgen.exe for any other reason is strictly prohibited. + + If you would like to use this software for any other reason, you must obtain a + personal or commercial license to do so. To do that you must contact RDS at + ferventcoder.com. + + This software is not free to distribute apart from the Chocolatey client. If you + would like to distribute this software outside of use through Chocolatey, you + must receive written permission from the software owner. + + =================================================================== + End-User License Agreement + =================================================================== + EULA - Shim Generator + + IMPORTANT- READ CAREFULLY: This RealDimensions Software ("RDS") End-User License + Agreement ("EULA") is a legal agreement between you ("END USER") and RDS for all + RDS products, controls, source code, demos, intermediate files, media, printed + materials, and "online" or electronic documentation ("SOFTWARE PRODUCT(S)") + contained with this distribution. + + RDS grants to END USER as an individual, a personal, nonexclusive license to + install and use the SOFTWARE PRODUCT(S) for the sole purpose of use with the + official Chocolatey client. By installing, copying, or otherwise using the + SOFTWARE PRODUCT(S), END USER agrees to be bound by the terms of this EULA. If + END USER does not agree to any part of the terms of this EULA, DO NOT INSTALL, + USE, OR EVALUATE, ANY PART, FILE OR PORTION OF THE SOFTWARE PRODUCT(S). + + ALL SOFTWARE PRODUCT(S) are licensed not sold. If END USER is an individual, + END USER must acquire an individual license for the SOFTWARE PRODUCT(S) from RDS + or its authorized resellers. If END USER is an entity, END USER must acquire an + individual license for each machine running the SOFTWARE PRODUCT(S) within your + organization from RDS or its authorized resellers. Both Virtual and Physical + Machines running the SOFTWARE PRODUCT(S) must be counted in the SOFTWARE + PRODUCT(S) licenses quantity of the organization. + + =================================================================== + Commercial / Personal Licensing + =================================================================== + Shim Generator (shimgen.exe) is also offered under personal and commercial + licenses. You can learn more about this option by contacting RDS at + http://ferventcoder.com +~~~ + +### SimpleInjector +Chocolatey uses [SimpleInjector](https://simpleinjector.org/) for IoC containers. [License Terms](https://github.com/simpleinjector/SimpleInjector/blob/0687195a7691363d4b4918e36b5e4d708e88253c/licence.txt): + +~~~ + Copyright (c) 2013 - 2017 Simple Injector Contributors + + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + documentation files (the "Software"), to deal in the Software without restriction, including without + limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the + Software, and to permit persons to whom the Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be included in all copies or substantial portions + of the Software. -## Other Credits -Chocolatey name started as a joke as what you would name a framework that would sit on top of NuGet as an enhancement + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED + TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +~~~ From fb396c319e6133ed763fd564b9d52be7ada1ed89 Mon Sep 17 00:00:00 2001 From: Matt Wrock Date: Mon, 3 Apr 2017 09:08:41 -0700 Subject: [PATCH 11/11] (GH-1231) Use DirectoryInfo to evaluate CacheLocation The former fix (GH-1210) fails when the CacheLocation ends with a slash. This uses a DirectoryInfo instance to examine the last directory in the path in a more robust manner --- .../infrastructure.app/builders/ConfigurationBuilder.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs index 774bb61094..4430d8103b 100644 --- a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs +++ b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs @@ -199,8 +199,8 @@ private static void set_config_items(ChocolateyConfiguration config, ConfigFileS config.CacheLocation = fileSystem.get_temp_path(); // System.Environment.GetEnvironmentVariable("TEMP"); // TEMP gets set in EnvironmentSettings, so it may already have // chocolatey in the path when it installs the next package from - // the API. - if(!config.CacheLocation.EndsWith("chocolatey")) { + // the API. + if(!fileSystem.get_directory_info_for(config.CacheLocation).Name.is_equal_to("chocolatey")) { config.CacheLocation = fileSystem.combine_paths(fileSystem.get_temp_path(), "chocolatey"); } }