Merge branch 'stable'

* stable:
  (GH-2051) Fix: workingDirectory always replaced w/cacheLocation
  (GH-1983) exit-on-reboot-detected environment variable
  (maint) update resharper settings
  (maint) formatting

src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1

@@ -118,20 +118,22 @@ param(
   [parameter(Mandatory=$false)][switch] $minimized,
   [parameter(Mandatory=$false)][switch] $noSleep,
   [parameter(Mandatory=$false)] $validExitCodes = @(0),
-  [parameter(Mandatory=$false)][string] $workingDirectory = $(Get-Location -PSProvider 'FileSystem'),
+  [parameter(Mandatory=$false)][string] $workingDirectory = $null,
   [parameter(Mandatory=$false)][string] $sensitiveStatements = '',
   [parameter(ValueFromRemainingArguments = $true)][Object[]] $ignoredArguments
 )
   [string]$statements = $statements -join ' '
 
   Write-FunctionCallLogMessage -Invocation $MyInvocation -Parameters $PSBoundParameters
 
-  if ($workingDirectory -eq $null -or $workingDirectory.ProviderPath -eq $null) {
-    Write-Debug "Unable to use current location for Working Directory. Using Cache Location instead."
-    $workingDirectory = $env:TEMP
+  if ($workingDirectory -eq $null) {
+    $pwd = $(Get-Location -PSProvider 'FileSystem')
+    if ($pwd -eq $null -or $pwd.ProviderPath -eq $null) {
+      Write-Debug "Unable to use current location for Working Directory. Using Cache Location instead."
+      $workingDirectory = $env:TEMP
+    }
+    $workingDirectory = $pwd.ProviderPath
   }
-  $workingDirectory = $workingDirectory.ProviderPath
-
   $alreadyElevated = $false
   if (Test-ProcessAdminRights) {
     $alreadyElevated = $true

src/chocolatey.sln.DotSettings

@@ -41,6 +41,9 @@ limitations under the License.
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=474957be_002Df1f1_002D44f8_002Da1ba_002D6fbd8a61587b/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Public" Description="Properties"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=b229e86b_002D47e7_002D493e_002D9c0f_002D2b53080cdad9/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Methods, Events"&gt;&lt;ElementKinds&gt;&lt;Kind Name="METHOD" /&gt;&lt;Kind Name="EVENT" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/LocationType/@EntryValue">SOLUTION_FOLDER</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>

src/chocolatey/GetChocolatey.cs

@@ -395,7 +395,7 @@ public int ListCount()
         public ChocolateyConfiguration GetConfiguration()
         {
             ensure_environment();
-
+            
             // ensure_original_configuration() already calls create_configuration()
             // so no need to repeat, just grab the result
             var configuration = ensure_original_configuration(
@@ -475,7 +475,6 @@ private ChocolateyConfiguration create_configuration(IList<string> args)
             configuration.PromptForConfirmation = false;
             configuration.AcceptLicense = true;
 
-
             if (_propConfig != null)
             {
                 _propConfig.Invoke(configuration);

src/chocolatey/infrastructure.app/ApplicationParameters.cs

@@ -122,6 +122,7 @@ public static class Environment
             public static readonly string ChocolateyCheckLastExitCode = "ChocolateyCheckLastExitCode";
             public static readonly string ChocolateyPowerShellHost = "ChocolateyPowerShellHost";
             public static readonly string ChocolateyForce = "ChocolateyForce";
+            public static readonly string ChocolateyExitOnRebootDetected = "ChocolateyExitOnRebootDetected";
         }
 
         /// <summary>

src/chocolatey/infrastructure.app/configuration/EnvironmentSettings.cs

@@ -56,6 +56,7 @@ public static void reset_environment_variables(ChocolateyConfiguration config)
             Environment.SetEnvironmentVariable(ApplicationParameters.Environment.ChocolateyAllowEmptyChecksumsSecure, null);
             Environment.SetEnvironmentVariable(ApplicationParameters.Environment.ChocolateyPowerShellHost, null);
             Environment.SetEnvironmentVariable(ApplicationParameters.Environment.ChocolateyForce, null);
+            Environment.SetEnvironmentVariable(ApplicationParameters.Environment.ChocolateyExitOnRebootDetected, null);
 
             Environment.SetEnvironmentVariable("chocolateyProxyLocation", null);
             Environment.SetEnvironmentVariable("chocolateyProxyBypassList", null);
@@ -127,6 +128,7 @@ public static void set_environment_variables(ChocolateyConfiguration config)
 
             if (config.Features.UsePowerShellHost) Environment.SetEnvironmentVariable(ApplicationParameters.Environment.ChocolateyPowerShellHost, "true");
             if (config.Force) Environment.SetEnvironmentVariable(ApplicationParameters.Environment.ChocolateyForce, "true");
+            if (config.Features.ExitOnRebootDetected) Environment.SetEnvironmentVariable(ApplicationParameters.Environment.ChocolateyExitOnRebootDetected, "true");
             set_licensed_environment(config);
         }
 

src/chocolatey/infrastructure.app/services/NugetService.cs

@@ -694,7 +694,6 @@ public virtual ConcurrentDictionary<string, PackageResult> upgrade_run(Chocolate
                 }
 
                 IPackage availablePackage = NugetList.find_package(packageName, version, config, packageManager.SourceRepository);
-
 
                 config.Prerelease = originalPrerelease;
 

src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs

@@ -108,6 +108,7 @@ Chocolatey makes a number of environment variables available (You can access any
 
  * ChocolateyEnvironmentDebug - Was `--debug` passed? If using the built-in PowerShell host, this is always true (but only logs debug messages to console if `--debug` was passed) (0.9.10+)
  * ChocolateyEnvironmentVerbose - Was `--verbose` passed? If using the built-in PowerShell host, this is always true (but only logs verbose messages to console if `--verbose` was passed). (0.9.10+)
+ * ChocolateyExitOnRebootDetected - Are we exiting on a detected reboot? Set by ` --exit-when-reboot-detected`  or the feature `exitOnRebootDetected` (0.10.16+)
  * ChocolateyForce - Was `--force` passed? (0.9.10+)
  * ChocolateyForceX86 - Was `-x86` passed? (CHECK)
  * ChocolateyRequestTimeout - How long before a web request will time out. Set by config `webRequestTimeoutSeconds` (CHECK)