Merge branch 'stable'

* stable:
  Remove duplicate word
  (chocolateyGH-1285) Default push to new or old w/warning
  (chocolateyGH-1285) Add old/new default push source
  (chocolateyGH-1298) GenericRunner.count() sets security protocol
  (chocolateyGH-1298) GenericRunner.list() should match run()
  (maint) API - Warn on extraction errors
  (chocolateyGH-389) API - Ensure ChocolateyInstall env var
  (maint) Do not load config back into global
  (chocolateyGH-1296) API - Reuse existing base configuration
  (maint) API - Note methods that won't allow changes
  (chocolateyGH-1294) API - Expose container directly
  (build) option to build debug version
  (doc) Source/Key notes surrounding source/apikey
  (maint) log that license file has been found
  (chocolateyGH-1287) Non-internal SimpleInjector XML Comments
  (maint) formatting
  (chocolateyGH-1287) API - Ensure dll can work w/licensed code
  (chocolateyGH-1284) Install-ChocolateyPackage aliases File/File64

.build.custom/ilmerge.internalize.ignore.dll.txt

@@ -1,2 +1,4 @@
 chocolatey.*
-NuGet.*
+NuGet.*
+SimpleInjector.*
+Rhino.Licensing.*

build.debug.bat

@@ -0,0 +1,35 @@
+@echo off
+
+::Project UppercuT - http://uppercut.googlecode.com
+::No edits to this file are required - http://uppercut.pbwiki.com
+
+if '%1' == '/?' goto usage
+if '%1' == '-?' goto usage
+if '%1' == '?' goto usage
+if '%1' == '/help' goto usage
+
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\.uppercut"
+
+%NANT% /logger:"NAnt.Core.DefaultLogger" /quiet /nologo /f:"%BUILD_DIR%.build\default.build" -D:build.config.settings=%build.config.settings% -D:msbuild.configuration="Debug" -D:run.nuget="false" -D:test.framework="None" -D:cover.framework="None" -D:run.codesign="false" %*
+
+::#-D:run.ilmerge="false"
+
+if %ERRORLEVEL% NEQ 0 goto errors
+
+call %DIR%\documentscenarios.bat
+
+goto finish
+
+:usage
+echo.
+echo Usage: build.bat
+echo.
+goto finish
+
+:errors
+EXIT /B %ERRORLEVEL%
+
+:finish

src/chocolatey.console/Program.cs

@@ -59,7 +59,7 @@ private static void Main(string[] args)
 
                 "LogFileOnly".Log().Info(() => "".PadRight(60, '='));
 
-                var config = container.GetInstance<ChocolateyConfiguration>();
+                var config = Config.get_configuration_settings();
                 var fileSystem = container.GetInstance<IFileSystem>();
 
                 var warnings = new List<string>();
@@ -71,7 +71,6 @@ private static void Main(string[] args)
                      license,
                      warning => { warnings.Add(warning); }
                      );
-                Config.initialize_with(config);
 
                 report_version_and_exit_if_requested(args, config);
 

src/chocolatey.resources/helpers/functions/Install-ChocolateyPackage.ps1

@@ -91,6 +91,12 @@ a 32 bit installation on a 64 bit system.
 
 Prefer HTTPS when available. Can be HTTP, FTP, or File URIs.
 
+In 0.10.6+, `File` and `FileFullPath` are aliases for Url. These 
+aliases, if used in earlier versions of Chocolatey, produce `ERROR: 
+Cannot bind parameter because parameter 'fileType' is specified more 
+than once.` See https://github.com/chocolatey/choco/issues/1284. Do not
+use these aliases with the community package repository until 2018.
+
 .PARAMETER Url64bit
 OPTIONAL - If there is a 64 bit resource available, use this
 parameter. Chocolatey will automatically determine if the user is
@@ -102,6 +108,13 @@ this parameter.
 
 Prefer HTTPS when available. Can be HTTP, FTP, or File URIs.
 
+In 0.10.6+, `File64` and `FileFullPath64` are aliases for Url64Bit. 
+These aliases, if used in earlier versions of Chocolatey, produce 
+`ERROR: Cannot bind parameter because parameter 'fileType' is specified
+more than once.` See https://github.com/chocolatey/choco/issues/1284. 
+Do not use these aliases with the community package repository until 
+2018.
+
 .PARAMETER ValidExitCodes
 Array of exit codes indicating success. Defaults to `@(0)`.
 
@@ -261,9 +274,9 @@ param(
   [parameter(Mandatory=$false, Position=1)]
   [alias("installerType","installType")][string] $fileType = 'exe',
   [parameter(Mandatory=$false, Position=2)][string[]] $silentArgs = '',
-  [parameter(Mandatory=$false, Position=3)][string] $url = '',
+  [alias("file","fileFullPath")][parameter(Mandatory=$false, Position=3)][string] $url = '',
   [parameter(Mandatory=$false, Position=4)]
-  [alias("url64")][string] $url64bit = '',
+  [alias("url64","file64","fileFullPath64")][string] $url64bit = '',
   [parameter(Mandatory=$false)] $validExitCodes = @(0),
   [parameter(Mandatory=$false)][string] $checksum = '',
   [parameter(Mandatory=$false)][string] $checksumType = '',