Merge branch 'stable'

* stable:
  (doc) update scenarios
  (doc) fix release notes - number of issues
  (version) 0.10.4
  (doc) update CHANGELOG/nuspec
  (GH-1095) ensure nuget logs verbose and fatal
  (GH-262) NuGet.Core support for bypass proxy
  (maint) ILMerge NuGet.Core pdb

.uppercut

@@ -19,8 +19,8 @@
   <property name="version.minor" value="10" overwrite="false" />
   <property name="version.patch" value="4" overwrite="false" />
   <property name="version.fix" value="0" overwrite="false" />
-  <property name="version.nuget.prerelease" value="beta1" overwrite="false" />
-  <property name="version.use.build_date" value="true" overwrite="false" />
+  <property name="version.nuget.prerelease" value="" overwrite="false" />
+  <property name="version.use.build_date" value="false" overwrite="false" />
   <property name="assembly.description" value="${project.name} is a product of ${company.name} - All Rights Reserved." overwrite="false" />
   <property name="assembly.copyright" value="Copyright © 2017 ${company.name}. Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved." overwrite="false" />
   <property name="sign.project_with_key" value="true" overwrite="false" />

CHANGELOG.md

@@ -4,11 +4,11 @@ This covers changes for the "chocolatey" and "chocolatey.lib" packages, which ar
 
 **NOTE**: If you have a licensed edition of Chocolatey ("chocolatey.extension"), refer to this in tandem with [Chocolatey Licensed CHANGELOG](https://github.com/chocolatey/choco/blob/master/CHANGELOG_LICENSED.md).
 
-## [0.10.4](https://github.com/chocolatey/choco/issues?q=milestone%3A0.10.4+is%3Aclosed) (unreleased)
+## [0.10.4](https://github.com/chocolatey/choco/issues?q=milestone%3A0.10.4+is%3Aclosed) (March 30, 2017)
 
-We're dubbing this the "10-4 good buddy" release. We've added some major functionality and fixes we think you are going to find top notch - dare we say as smooth as really expensive chocolate? A lot of work for this release has been provided by the community. Remember that Chocolatey is only as good as the support that comes from the community! Be sure to thank other community members for the awesome that is Chocolatey and Chocolatey 10-4. We've closed over 30 bugs and added 39 enhancements!
+We're dubbing this the "10-4 good buddy" release. We've added some major functionality and fixes we think you are going to find top notch - dare we say as smooth as really expensive chocolate? A lot of work for this release has been provided by the community. Remember that Chocolatey is only as good as the support that comes from the community! Be sure to thank other community members for the awesome that is Chocolatey and Chocolatey 10-4. We've closed over 30 bugs and added over 39 enhancements (75 tickets in total)!
 
-Proxy support just got some major enhancements with the ability to not only [specify proxy information at runtime](https://github.com/chocolatey/choco/issues/1173), but also to [set bypass lists and bypassing on local connections](https://github.com/chocolatey/choco/issues/1165). A major issue with [changing command execution timeout](https://github.com/chocolatey/choco/issues/1059) was just fixed. And there used to be a tiny chance you might [corrupt the choco config when running multiple choco processes](https://github.com/chocolatey/choco/issues/1047) - which is now fixed.
+Proxy support just got some major enhancements with the ability to not only [specify proxy information at runtime](https://github.com/chocolatey/choco/issues/1173), but also to [set bypass lists and bypassing on local connections](https://github.com/chocolatey/choco/issues/1165) and [configure source repositories to bypass proxies](https://github.com/chocolatey/choco/issues/262). A major issue with [changing command execution timeout](https://github.com/chocolatey/choco/issues/1059) was just fixed. And there used to be a tiny chance you might [corrupt the choco config when running multiple choco processes](https://github.com/chocolatey/choco/issues/1047) -but now that is much better handled.
 
 We've also made [package itself display download progress](https://github.com/chocolatey/choco/issues/1134), which is great when software binaries are embedded in packages. For you folks looking to remove any progress (like when using Vagrant), now you can use [`--no-progress`](https://github.com/chocolatey/choco/issues/917). When NuGet.Core has issues, those issues will have more visibility into why things are failing without needing a debugging log. Speaking of some extreme visibility, see network traffic with [`--trace`](https://github.com/chocolatey/choco/issues/1182).
 
@@ -84,6 +84,7 @@ Another major feature released in preview is [using remembered arguments on upgr
  * [Security] Username and password for `choco apikey` not encrypted in output - see [#1106](https://github.com/chocolatey/choco/issues/1106)
  * [Security] Sign Binaries / Authenticode Signatures with Chocolatey Software digital certificate - see [#1214](https://github.com/chocolatey/choco/issues/1214)
  * Setting commandExecutionTimeout to 0 means never time out - see [#1202](https://github.com/chocolatey/choco/issues/1202)
+ * Configure sources to skip proxy - see [#262](https://github.com/chocolatey/choco/issues/262)
  * Set proxy information at runtime - see [#1173](https://github.com/chocolatey/choco/issues/1173)
  * Start-ChocolateyProcessAsAdmin should not elevate when already elevated - see [#1126](https://github.com/chocolatey/choco/issues/1126)
  * Add `--no-progress` cli switch for hidding progress bars - see [#917](https://github.com/chocolatey/choco/issues/917)

Scenarios.md

@@ -649,7 +649,7 @@
 
  * should throw an error that it is not allowed
 
-### ChocolateyUpgradeCommand [ 35 Scenario(s), 286 Observation(s) ]
+### ChocolateyUpgradeCommand [ 36 Scenario(s), 295 Observation(s) ]
 
 #### when force upgrading a package
 
@@ -1006,6 +1006,18 @@
  * should not have warning package result
  * should not remove the package from the lib directory
 
+#### when upgrading an existing prerelease package with allow downgrade with excludeprelease and without prerelease specified
+
+ * should be the same version of the package
+ * should contain a message that no packages were upgraded
+ * should contain a message that you have the latest version available
+ * should have a successful package result
+ * should have inconclusive package result
+ * should not create a rollback
+ * should not have warning package result
+ * should not remove the package from the lib directory
+ * should only find the last stable version
+
 #### when upgrading an existing prerelease package with prerelease available with excludeprelease and without prerelease specified
 
  * should be the same version of the package

lib/NuGet-Chocolatey/strongname.cmd

@@ -7,4 +7,7 @@ SET DIR=%~d0%~p0%
 echo Make sure you have webtransform here for the merge. Continue?
 pause
 
-%DIR%..\ILMerge\ILMerge.exe NuGet.Core.dll /keyfile:%DIR%..\..\chocolatey.snk /out:%DIR%NuGet.Core.dll /targetplatform:v4,"%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0" /log:%DIR%ILMerge.DELETE.log /ndebug /allowDup
+mkdir %DIR%\output
+
+%DIR%..\ILMerge\ILMerge.exe NuGet.Core.dll /keyfile:%DIR%..\..\chocolatey.snk /out:%DIR%\output\NuGet.Core.dll /targetplatform:v4,"%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0" /log:%DIR%ILMerge.DELETE.log /allowDup
+REM %DIR%..\ILMerge\ILMerge.exe NuGet.Core.dll /keyfile:%DIR%..\..\chocolatey.snk /out:%DIR%NuGet.Core.dll /targetplatform:v4,"%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0" /log:%DIR%ILMerge.DELETE.log /ndebug /allowDup

nuget/chocolatey/chocolatey.nuspec

@@ -11,7 +11,7 @@
     <iconUrl>https://raw.githubusercontent.com/chocolatey/choco/master/docs/logo/chocolateyicon.gif</iconUrl>
     <licenseUrl>https://raw.githubusercontent.com/chocolatey/choco/master/LICENSE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>RealDimensions Software, LLC - 2011-Present</copyright>
+    <copyright>2017 Chocolatey Software, Inc, 2011- 2017 RealDimensions Software, LLC</copyright>
     <!--<projectSourceUrl>https://github.com/chocolatey/choco</projectSourceUrl>
     <docsUrl>https://chocolatey.org/docs</docsUrl>
     <mailingListUrl>https://groups.google.com/forum/#!forum/chocolatey</mailingListUrl>
@@ -57,9 +57,9 @@ See all - https://github.com/chocolatey/choco/blob/stable/CHANGELOG.md
 
 ## 0.10.4
 
-We're dubbing this the "10-4 good buddy" release. We've added some major functionality and fixes we think you are going to find top notch - dare we say as smooth as really expensive chocolate? A lot of work for this release has been provided by the community. Remember that Chocolatey is only as good as the support that comes from the community! Be sure to thank other community members for the awesome that is Chocolatey and Chocolatey 10-4. We've closed over 30 bugs and added 39 enhancements!
+We're dubbing this the "10-4 good buddy" release. We've added some major functionality and fixes we think you are going to find top notch - dare we say as smooth as really expensive chocolate? A lot of work for this release has been provided by the community. Remember that Chocolatey is only as good as the support that comes from the community! Be sure to thank other community members for the awesome that is Chocolatey and Chocolatey 10-4. We've closed over 30 bugs and added over 39 enhancements (75 tickets in total)!
 
-Proxy support just got some major enhancements with the ability to not only [specify proxy information at runtime](https://github.com/chocolatey/choco/issues/1173), but also to [set bypass lists and bypassing on local connections](https://github.com/chocolatey/choco/issues/1165). A major issue with [changing command execution timeout](https://github.com/chocolatey/choco/issues/1059) was just fixed. And there used to be a tiny chance you might [corrupt the choco config when running multiple choco processes](https://github.com/chocolatey/choco/issues/1047) - which is now fixed.
+Proxy support just got some major enhancements with the ability to not only [specify proxy information at runtime](https://github.com/chocolatey/choco/issues/1173), but also to [set bypass lists and bypassing on local connections](https://github.com/chocolatey/choco/issues/1165) and [configure source repositories to bypass proxies](https://github.com/chocolatey/choco/issues/262). A major issue with [changing command execution timeout](https://github.com/chocolatey/choco/issues/1059) was just fixed. And there used to be a tiny chance you might [corrupt the choco config when running multiple choco processes](https://github.com/chocolatey/choco/issues/1047) -but now that is much better handled.
 
 We've also made [package itself display download progress](https://github.com/chocolatey/choco/issues/1134), which is great when software binaries are embedded in packages. For you folks looking to remove any progress (like when using Vagrant), now you can use [`--no-progress`](https://github.com/chocolatey/choco/issues/917). When NuGet.Core has issues, those issues will have more visibility into why things are failing without needing a debugging log. Speaking of some extreme visibility, see network traffic with [`--trace`](https://github.com/chocolatey/choco/issues/1182).
 
@@ -135,6 +135,7 @@ Another major feature released in preview is [using remembered arguments on upgr
  * [Security] Username and password for `choco apikey` not encrypted in output - see [#1106](https://github.com/chocolatey/choco/issues/1106)
  * [Security] Sign Binaries / Authenticode Signatures with Chocolatey Software digital certificate - see [#1214](https://github.com/chocolatey/choco/issues/1214)
  * Setting commandExecutionTimeout to 0 means never time out - see [#1202](https://github.com/chocolatey/choco/issues/1202)
+ * Configure sources to skip proxy - see [#262](https://github.com/chocolatey/choco/issues/262)
  * Set proxy information at runtime - see [#1173](https://github.com/chocolatey/choco/issues/1173)
  * Start-ChocolateyProcessAsAdmin should not elevate when already elevated - see [#1126](https://github.com/chocolatey/choco/issues/1126)
  * Add `--no-progress` cli switch for hidding progress bars - see [#917](https://github.com/chocolatey/choco/issues/917)

src/chocolatey/infrastructure.app/nuget/ChocolateyNugetLogger.cs

@@ -43,13 +43,13 @@ public void Log(MessageLevel level, string message, params object[] args)
                     break;
                 case MessageLevel.Error:
                     this.Log().Error("[NuGet] " + message, args);
-                    break; 
-                //todo: case MessageLevel.Fatal:
-                //    this.Log().Fatal("[NuGet] " + message, args);
-                //    break;
-                //case MessageLevel.Verbose:
-                //    this.Log().Info(ChocolateyLoggers.Verbose,"[NuGet] " + message, args);
-                //    break;
+                    break;
+                case MessageLevel.Fatal:
+                    this.Log().Fatal("[NuGet] " + message, args);
+                    break;
+                case MessageLevel.Verbose:
+                    this.Log().Info(ChocolateyLoggers.Verbose, "[NuGet] " + message, args);
+                    break;
             }
         }
     }