diff --git a/.editorconfig b/.editorconfig
index 92f475bca..108d2a4ba 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -73,3 +73,5 @@ csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 csharp_style_inlined_variable_declaration = true:suggestion
 csharp_style_throw_expression = true:suggestion
 csharp_style_conditional_delegate_call = true:suggestion
+dotnet_diagnostic.RS0030.severity = error
+dotnet_diagnostic.RS0031.severity = error
diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
index 990e59465..c734b6517 100644
--- a/.teamcity/settings.kts
+++ b/.teamcity/settings.kts
@@ -3,10 +3,9 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.powerShell
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
 import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
 
-version = "2021.2"
-
 project {
     buildType(ChocolateyGUI)
 }
@@ -62,7 +61,10 @@ object ChocolateyGUI : BuildType({
 
         script {
             name = "Call Cake"
-            scriptContent = "call build.official.bat"
+            scriptContent = """
+                IF "%teamcity.build.triggeredBy%" == "Schedule Trigger" (SET TestType=all) ELSE (SET TestType=unit)
+                call build.official.bat --verbosity=diagnostic --target=CI --testExecutionType=%%TestType%% --shouldRunOpenCover=false
+            """.trimIndent()
         }
     }
 
@@ -70,6 +72,17 @@ object ChocolateyGUI : BuildType({
         vcs {
             branchFilter = ""
         }
+        schedule {
+            schedulingPolicy = daily {
+                hour = 2
+                minute = 0
+            }
+            branchFilter = """
+                +:<default>
+            """.trimIndent()
+            triggerBuild = always()
+			withPendingChangesOnly = false
+        }
     }
 
     features {
diff --git a/GitReleaseManager.yaml b/GitReleaseManager.yaml
index e1d1067c1..1f8c78c2d 100644
--- a/GitReleaseManager.yaml
+++ b/GitReleaseManager.yaml
@@ -8,7 +8,7 @@ issue-labels-include:
 - Documentation
 issue-labels-exclude:
 - Internal Refactoring
-- Build
+- BuildAutomation
 - NO RELEASE NOTES
 issue-labels-alias:
     - name:    Documentation
diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj
index 7067166d5..511069137 100644
--- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj
+++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -68,7 +68,7 @@
       <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="chocolatey">
-      <HintPath>..\packages\chocolatey.lib.2.0.0\lib\net48\chocolatey.dll</HintPath>
+      <HintPath>..\packages\chocolatey.lib.2.1.0\lib\net48\chocolatey.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private Condition="'$(Configuration)' != 'Debug'">False</Private>
     </Reference>
@@ -235,6 +235,7 @@
     <Compile Include="Services\IPackageArgumentsService.cs" />
     <Compile Include="Services\PackageArgumentsService.cs" />
     <Compile Include="Utilities\Converters\LocalizationConverter.cs" />
+    <Compile Include="Utilities\Converters\NuGetVersionToString.cs" />
     <Compile Include="Utilities\Extensions\LocalizeExtension.cs" />
     <Compile Include="Utilities\Converters\NullToInverseBool.cs" />
     <Compile Include="Utilities\ToolTipBehavior.cs" />
@@ -422,9 +423,16 @@
     <SourceRoot Include="$(MSBuildThisFileDirectory)/../" />
   </ItemGroup>
   <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.BannedApiAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="..\ChocolateyGui\BannedSymbols.txt">
+      <Link>BannedSymbols.txt</Link>
+    </AdditionalFiles>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\HarfBuzzSharp.2.6.1.4\build\net462\HarfBuzzSharp.targets" Condition="Exists('..\packages\HarfBuzzSharp.2.6.1.4\build\net462\HarfBuzzSharp.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs
index de9df8649..86058ab6e 100644
--- a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs
+++ b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs
@@ -132,6 +132,11 @@ public async Task<IReadOnlyList<OutdatedPackage>> GetOutdatedPackages(bool inclu
                         config.RegularOutput = false;
                         config.QuietOutput = true;
                         config.Prerelease = false;
+
+                        if (forceCheckForOutdatedPackages)
+                        {
+                            config.SetCacheExpirationInMinutes(0);
+                        }
                     });
                 var chocoConfig = choco.GetConfiguration();
 
@@ -195,7 +200,7 @@ public async Task<PackageOperationResult> InstallPackage(
 
                             if (version != null)
                             {
-                                config.Version = version.ToString();
+                                config.Version = version;
                             }
 
                             if (source != null)
@@ -248,6 +253,11 @@ public async Task<PackageOperationResult> InstallPackage(
                                 config.DownloadChecksum64 = advancedInstallOptions.DownloadChecksum64bit;
                                 config.DownloadChecksumType = advancedInstallOptions.DownloadChecksumType;
                                 config.DownloadChecksumType64 = advancedInstallOptions.DownloadChecksumType64bit;
+
+                                if (advancedInstallOptions.IgnoreHttpCache)
+                                {
+                                    config.SetCacheExpirationInMinutes(0);
+                                }
                             }
                         });
 
diff --git a/Source/ChocolateyGui.Common.Windows/Utilities/Converters/NuGetVersionToString.cs b/Source/ChocolateyGui.Common.Windows/Utilities/Converters/NuGetVersionToString.cs
new file mode 100644
index 000000000..8137dda5e
--- /dev/null
+++ b/Source/ChocolateyGui.Common.Windows/Utilities/Converters/NuGetVersionToString.cs
@@ -0,0 +1,43 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright company="Chocolatey" file="NuGetVersionToString.cs">
+//   Copyright 2017 - Present Chocolatey Software, LLC
+//   Copyright 2014 - 2017 Rob Reynolds, the maintainers of Chocolatey, and RealDimensions Software, LLC
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace ChocolateyGui.Common.Windows.Utilities.Converters
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+    using System.Windows;
+    using System.Windows.Data;
+    using chocolatey;
+    using NuGet.Versioning;
+
+    public class NuGetVersionToString : DependencyObject, IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is NuGetVersion version)
+            {
+                return version.ToNormalizedStringChecked();
+            }
+
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is string sValue && NuGetVersion.TryParse(sValue, out var version))
+            {
+                return version;
+            }
+
+            throw new InvalidOperationException("The passed in value is not a parseable string version!");
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs
index 524a88e14..6fd8fe461 100644
--- a/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs
+++ b/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs
@@ -42,6 +42,7 @@ public class AdvancedInstallViewModel : ObservableBase, IClosableChildWindow<Adv
         private bool _applyInstallArgumentsToDependencies;
         private bool _applyPackageParametersToDependencies;
         private bool _allowDowngrade;
+        private bool _ignoreHttpCache;
         private bool _ignoreDependencies;
         private bool _forceDependencies;
         private bool _skipPowerShell;
@@ -66,7 +67,7 @@ public AdvancedInstallViewModel(
 
             _cts = new CancellationTokenSource();
 
-            _packageVersion = packageVersion.ToString();
+            _packageVersion = packageVersion.ToNormalizedStringChecked();
             SelectedVersion = _packageVersion;
 
             FetchAvailableVersions();
@@ -225,6 +226,17 @@ public bool AllowDowngrade
             set { SetPropertyValue(ref _allowDowngrade, value); }
         }
 
+        public bool IgnoreHttpCache
+        {
+            get { return _ignoreHttpCache; }
+            set { SetPropertyValue(ref _ignoreHttpCache, value); }
+        }
+
+        public bool IgnoreHttpCacheIsAvailable
+        {
+            get { return ChocolateyConfigurationExtensions.HasCacheExpirationInMinutes(); }
+        }
+
         public bool IgnoreDependencies
         {
             get
diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs
index 61218a17e..2070d1668 100644
--- a/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs
+++ b/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs
@@ -11,6 +11,7 @@
 using System.Threading.Tasks;
 using AutoMapper;
 using Caliburn.Micro;
+using chocolatey;
 using ChocolateyGui.Common.Base;
 using ChocolateyGui.Common.Models;
 using ChocolateyGui.Common.Models.Messages;
@@ -405,7 +406,8 @@ public bool IsPackageSizeAvailable
 
         public async Task ShowArguments()
         {
-            var decryptedArguments = _packageArgumentsService.DecryptPackageArgumentsFile(Id, Version.ToString()).ToList();
+            // TODO: Add legacy handling for packages installed prior to v2.0.0.
+            var decryptedArguments = _packageArgumentsService.DecryptPackageArgumentsFile(Id, Version.ToNormalizedStringChecked()).ToList();
 
             if (decryptedArguments.Count == 0)
             {
@@ -423,7 +425,7 @@ await _dialogService.ShowMessageAsync(
 
         public async Task Install()
         {
-            await InstallPackage(Version.ToString());
+            await InstallPackage(Version.ToNormalizedStringChecked());
         }
 
         public async Task InstallAdvanced()
@@ -465,7 +467,7 @@ public async Task Reinstall()
                 {
                     using (await StartProgressDialog(L(nameof(Resources.PackageViewModel_ReinstallingPackage)), L(nameof(Resources.PackageViewModel_ReinstallingPackage)), Id))
                     {
-                        await _chocolateyService.InstallPackage(Id, Version.ToString(), Source, true);
+                        await _chocolateyService.InstallPackage(Id, Version.ToNormalizedStringChecked(), Source, true);
                         _chocolateyGuiCacheService.PurgeOutdatedPackages();
                         await _eventAggregator.PublishOnUIThreadAsync(new PackageChangedMessage(Id, PackageChangeType.Installed, Version));
                     }
@@ -496,7 +498,7 @@ public async Task Uninstall()
                 {
                     using (await StartProgressDialog(L(nameof(Resources.PackageViewModel_UninstallingPackage)), L(nameof(Resources.PackageViewModel_UninstallingPackage)), Id))
                     {
-                        var result = await _chocolateyService.UninstallPackage(Id, Version.ToString(), true);
+                        var result = await _chocolateyService.UninstallPackage(Id, Version.ToNormalizedStringChecked(), true);
 
                         if (!result.Successful)
                         {
@@ -584,7 +586,7 @@ public async Task Pin()
             {
                 using (await StartProgressDialog(L(nameof(Resources.PackageViewModel_PinningPackage)), L(nameof(Resources.PackageViewModel_PinningPackage)), Id))
                 {
-                    var result = await _chocolateyService.PinPackage(Id, Version.ToString());
+                    var result = await _chocolateyService.PinPackage(Id, Version.ToNormalizedStringChecked());
 
                     if (!result.Successful)
                     {
@@ -628,7 +630,7 @@ public async Task Unpin()
             {
                 using (await StartProgressDialog(L(nameof(Resources.PackageViewModel_UnpinningPackage)), L(nameof(Resources.PackageViewModel_UnpinningPackage)), Id))
                 {
-                    var result = await _chocolateyService.UnpinPackage(Id, Version.ToString());
+                    var result = await _chocolateyService.UnpinPackage(Id, Version.ToNormalizedStringChecked());
 
                     if (!result.Successful)
                     {
diff --git a/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml b/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml
index de7eaeab0..be6b32e20 100644
--- a/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml
+++ b/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml
@@ -19,6 +19,7 @@
         <converters:BooleanToVisibilityInverted x:Key="BooleanToVisibilityInverted" />
         <converters:NullToInverseBool x:Key="NullToInverseBool" />
         <converters:BooleanInverter x:Key="BooleanInverter" />
+        <converters:BooleanToVisibility x:Key="BooleanToVisibilty" />
         <GridLength x:Key="ToggleSwitchPreContentMargin">0</GridLength>
         <GridLength x:Key="ToggleSwitchPostContentMargin">0</GridLength>
 
@@ -247,6 +248,9 @@
                                     <Button Grid.Column="1" Content="{lang:Localize AdvancedChocolateyDialog_Browse}" Command="{Binding BrowseLogFileCommand}" />
                                 </Grid>
                             </mah:MetroHeader>
+                            <mah:MetroHeader Header="{lang:Localize AdvancedChocolateyDialog_IgnoreHttpCache_Header}" Tag="{lang:Localize AdvancedChocolateyDialog_IgnoreHttpCache_ToolTip}" Visibility="{Binding IgnoreHttpCacheIsAvailable, Converter={StaticResource BooleanToVisibilty}}">
+                                <mah:ToggleSwitch VerticalAlignment="Center" IsOn="{Binding IgnoreHttpCache}" />
+                            </mah:MetroHeader>
                             <mah:MetroHeader Header="{lang:Localize AdvancedChocolateyDialog_OverrideArguments_Header}" Tag="{lang:Localize AdvancedChocolateyDialog_OverrideArguments_ToolTip}">
                                 <mah:ToggleSwitch VerticalAlignment="Center" IsOn="{Binding OverrideArguments}">
                                     <mah:ToggleSwitch.IsEnabled>
diff --git a/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml b/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml
index 3c3b0736d..6e532a798 100644
--- a/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml
+++ b/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml
@@ -14,12 +14,14 @@
              xmlns:commands="clr-namespace:ChocolateyGui.Common.Windows.Commands"
              xmlns:controls="clr-namespace:ChocolateyGui.Common.Windows.Controls"
              xmlns:theming="clr-namespace:ChocolateyGui.Common.Windows.Theming"
+             xmlns:converters="clr-namespace:ChocolateyGui.Common.Windows.Utilities.Converters"
              mc:Ignorable="d"
              d:DesignHeight="768" d:DesignWidth="1366"
-             d:DataContext="{d:DesignInstance viewModels:LocalSourceViewModel}"
+             d:DataContext="{d:DesignInstance {x:Type viewModels:LocalSourceViewModel}}"
              Background="{DynamicResource MahApps.Brushes.ThemeBackground}">
 
     <UserControl.Resources>
+        <converters:NuGetVersionToString x:Key="NuGetVersionToString"/>
         <utilities:BindingProxy x:Key="BindingProxy" Data="{Binding}" />
         <utilities:PackageAuthorsComparer x:Key="PackageAuthorsComparer" />
 
@@ -59,12 +61,12 @@
                 <TextBlock Grid.Row="2"
                            Margin="4 0"
                            Style="{DynamicResource TileLatestVersionTextStyle}"
-                           Text="{Binding LatestVersion, Mode=OneWay}" />
+                           Text="{Binding LatestVersion, Converter={StaticResource NuGetVersionToString}, Mode=OneWay}" />
 
                 <TextBlock Grid.Row="3"
                            Margin="4 0 4 1"
                            Style="{DynamicResource TileVersionTextStyle}"
-                           Text="{Binding Version, Mode=OneWay}" />
+                           Text="{Binding Version, Converter={StaticResource NuGetVersionToString}, Mode=OneWay}" />
 
                 <ContentControl x:Name="OutOfDateOverlay" Grid.Row="0" Grid.RowSpan="4"
                                 Visibility="Collapsed"
@@ -320,7 +322,7 @@
                                                             <ColumnDefinition Width="*" />
                                                         </Grid.ColumnDefinitions>
                                                         <TextBlock Grid.Column="0"
-                                                                   Text="{Binding LatestVersion, IsAsync=True}"
+                                                                   Text="{Binding LatestVersion, Converter={StaticResource NuGetVersionToString}, IsAsync=True}"
                                                                    Padding="3 3 2 3"
                                                                    VerticalAlignment="Stretch"
                                                                    HorizontalAlignment="Left"
diff --git a/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml b/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml
index 006057bf4..03f6134bf 100644
--- a/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml
+++ b/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml
@@ -24,6 +24,7 @@
     </FrameworkElement.CommandBindings>
 
     <UserControl.Resources>
+        <converters:NuGetVersionToString x:Key="NuGetVersionToString"/>
         <converters:NullToVisibility x:Key="UriToVisibility" />
         <converters:NullToVisibility x:Key="NullToVisibility" />
         <converters:LongSizeToFileSizeString x:Key="LongSizeToFileSizeString" />
@@ -196,7 +197,7 @@
             <Label Style="{StaticResource PackageResourceLabel}"
                    Content="{lang:Localize PackageView_Version}"
                    Target="{Binding ElementName=Version}" />
-            <TextBlock x:Name="Version" Text="{Binding Version}"
+            <TextBlock x:Name="Version" Text="{Binding Version, Converter={StaticResource NuGetVersionToString}}"
                        Style="{StaticResource PackageResourceValue}" />
             
             <Label Style="{StaticResource PackageResourceLabel}" Content="{lang:Localize PackageView_Downloads}"
diff --git a/Source/ChocolateyGui.Common.Windows/Views/RemoteSourceView.xaml b/Source/ChocolateyGui.Common.Windows/Views/RemoteSourceView.xaml
index 270ec5564..23b31a91f 100644
--- a/Source/ChocolateyGui.Common.Windows/Views/RemoteSourceView.xaml
+++ b/Source/ChocolateyGui.Common.Windows/Views/RemoteSourceView.xaml
@@ -12,6 +12,7 @@
              xmlns:commands="clr-namespace:ChocolateyGui.Common.Windows.Commands"
              xmlns:controls="clr-namespace:ChocolateyGui.Common.Windows.Controls"
              xmlns:theming="clr-namespace:ChocolateyGui.Common.Windows.Theming"
+             xmlns:converters="clr-namespace:ChocolateyGui.Common.Windows.Utilities.Converters"
              mc:Ignorable="d"
              d:DesignHeight="768" d:DesignWidth="1366"
              d:DataContext="{d:DesignInstance viewModels:RemoteSourceViewModel}"
@@ -19,6 +20,7 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
+            <converters:NuGetVersionToString x:Key="NuGetVersionToString"/>
             <DataTemplate x:Key="PackageListTemplate" DataType="{x:Type items:IPackageViewModel}">
                 <Grid Height="115" Margin="5"
                       Background="Transparent"
@@ -43,7 +45,7 @@
                                 <TextBlock.Text>
                                     <MultiBinding StringFormat="{}{0} {1}">
                                         <Binding Path="Title" Mode="OneWay" />
-                                        <Binding Path="Version" Mode="OneWay" />
+                                        <Binding Path="Version" Mode="OneWay" Converter="{StaticResource NuGetVersionToString}" />
                                     </MultiBinding>
                                 </TextBlock.Text>
                             </TextBlock>
@@ -151,7 +153,7 @@
                                     <TextBlock.Text>
                                         <MultiBinding StringFormat="{}{0} {1}">
                                             <Binding Path="Title" Mode="OneWay" />
-                                            <Binding Path="Version" Mode="OneWay" />
+                                            <Binding Path="Version" Mode="OneWay" Converter="{StaticResource NuGetVersionToString}" />
                                         </MultiBinding>
                                     </TextBlock.Text>
                                 </TextBlock>
@@ -270,7 +272,7 @@
                     <TextBlock Grid.Row="2"
                                Margin="4 0 4 1"
                                Style="{DynamicResource TileVersionTextStyle}"
-                               Text="{Binding Version, Mode=OneWay}" />
+                               Text="{Binding Version, Converter={StaticResource NuGetVersionToString}, Mode=OneWay}" />
 
                     <ContentControl x:Name="IsInstalledOverlay" Grid.Row="0" Grid.RowSpan="3"
                                     Visibility="Collapsed"
diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config
index 0407ee0ea..f32c98418 100644
--- a/Source/ChocolateyGui.Common.Windows/packages.config
+++ b/Source/ChocolateyGui.Common.Windows/packages.config
@@ -5,7 +5,7 @@
   <package id="BuildTools.FxCop" version="1.0.1" targetFramework="net40" />
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net48" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net48" />
-  <package id="chocolatey.lib" version="2.0.0" targetFramework="net48" />
+  <package id="chocolatey.lib" version="2.1.0" targetFramework="net48" />
   <package id="ControlzEx" version="4.4.0" targetFramework="net48" />
   <package id="Fizzler" version="1.2.0" targetFramework="net48" />
   <package id="HarfBuzzSharp" version="2.6.1.4" targetFramework="net48" />
@@ -20,6 +20,7 @@
   <package id="MahApps.Metro.SimpleChildWindow" version="2.0.0" targetFramework="net48" />
   <package id="Markdig.Signed" version="0.23.0" targetFramework="net48" />
   <package id="Markdig.Wpf.Signed" version="0.5.0.1" targetFramework="net48" />
+  <package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="3.3.4" targetFramework="net48" developmentDependency="true" />
   <package id="Microsoft.NETCore.Platforms" version="3.1.0" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Validation" version="15.3.15" targetFramework="net452" />
diff --git a/Source/ChocolateyGui.Common/ChocolateyConfigurationExtensions.cs b/Source/ChocolateyGui.Common/ChocolateyConfigurationExtensions.cs
new file mode 100644
index 000000000..4e8835993
--- /dev/null
+++ b/Source/ChocolateyGui.Common/ChocolateyConfigurationExtensions.cs
@@ -0,0 +1,34 @@
+namespace ChocolateyGui.Common
+{
+    using System;
+    using chocolatey;
+    using chocolatey.infrastructure.app.configuration;
+
+    public static class ChocolateyConfigurationExtensions
+    {
+        [Obsolete("This is used only for backwards compatibility, should be removed when updating Chocolatey CLI reference in the nuspec.")]
+        public static bool HasCacheExpirationInMinutes()
+        {
+            var configType = typeof(ChocolateyConfiguration);
+
+            return configType.GetProperty("CacheExpirationInMinutes") != null;
+        }
+
+        [Obsolete("This is used only for backwards compatibility, should be removed when updating Chocolatey CLI reference in the nuspec.")]
+        public static void SetCacheExpirationInMinutes(this ChocolateyConfiguration config, int cacheExpirationInMinutes)
+        {
+            var configType = config.GetType();
+
+            var property = configType.GetProperty("CacheExpirationInMinutes");
+
+            if (property != null)
+            {
+                property.SetValue(config, cacheExpirationInMinutes);
+            }
+            else
+            {
+                "chocolatey".Log().Warn("CacheExpirationInMinutes property is not available. Unable to ignore existing cached items!");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj
index 5e06ea85c..e5667103c 100644
--- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj
+++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -55,7 +55,7 @@
       <HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>
     </Reference>
     <Reference Include="chocolatey">
-      <HintPath>..\packages\chocolatey.lib.2.0.0\lib\net48\chocolatey.dll</HintPath>
+      <HintPath>..\packages\chocolatey.lib.2.1.0\lib\net48\chocolatey.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private Condition="'$(Configuration)' != 'Debug'">False</Private>
     </Reference>
@@ -119,6 +119,7 @@
     <Compile Include="Attributes\LocalizedDescriptionAttribute.cs" />
     <Compile Include="Base\ConnectionClosedException.cs" />
     <Compile Include="Base\ObservableBase.cs" />
+    <Compile Include="ChocolateyConfigurationExtensions.cs" />
     <Compile Include="ChocolateyExtensions.cs" />
     <Compile Include="ColouredConsoleSink.cs" />
     <Compile Include="Commands\BaseCommand.cs" />
@@ -226,6 +227,8 @@
     <SourceRoot Include="$(MSBuildThisFileDirectory)/../" />
   </ItemGroup>
   <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.BannedApiAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
     <SourceRoot Include="$(MSBuildThisFileDirectory)/../" />
@@ -233,5 +236,10 @@
   <ItemGroup>
     <Folder Include="Startup\Adapters\" />
   </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="..\ChocolateyGui\BannedSymbols.txt">
+      <Link>BannedSymbols.txt</Link>
+    </AdditionalFiles>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs b/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs
index ae9e89d08..c43f3a142 100644
--- a/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs
+++ b/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs
@@ -39,6 +39,8 @@ public class AdvancedInstall
 
         public bool SkipPowerShell { get; set; }
 
+        public bool IgnoreHttpCache { get; set; }
+
         public bool IgnoreChecksums { get; set; }
 
         public bool AllowEmptyChecksums { get; set; }
diff --git a/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs b/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs
index 393bacee0..ff2b4b5ac 100644
--- a/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs
+++ b/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -19,7 +19,7 @@ namespace ChocolateyGui.Common.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
@@ -429,6 +429,24 @@ public static string AdvancedChocolateyDialog_IgnoreDependencies_ToolTip {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Ignore HTTP Cache.
+        /// </summary>
+        public static string AdvancedChocolateyDialog_IgnoreHttpCache_Header {
+            get {
+                return ResourceManager.GetString("AdvancedChocolateyDialog_IgnoreHttpCache_Header", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ignore any HTTP caches that have previously been created when querying sources, and create new caches.
+        /// </summary>
+        public static string AdvancedChocolateyDialog_IgnoreHttpCache_ToolTip {
+            get {
+                return ResourceManager.GetString("AdvancedChocolateyDialog_IgnoreHttpCache_ToolTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Include PreRelease?.
         /// </summary>
diff --git a/Source/ChocolateyGui.Common/Properties/Resources.resx b/Source/ChocolateyGui.Common/Properties/Resources.resx
index fc7e926fa..908dc1763 100644
--- a/Source/ChocolateyGui.Common/Properties/Resources.resx
+++ b/Source/ChocolateyGui.Common/Properties/Resources.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -1377,4 +1377,10 @@ Please contact your System Administrator to enable this operation.</value>
     <value>Browse</value>
     <comment>This text is used for both when a user clicks a button supposed to select a file, and when selecting a folder.</comment>
   </data>
-</root>
+  <data name="AdvancedChocolateyDialog_IgnoreHttpCache_Header" xml:space="preserve">
+    <value>Ignore HTTP Cache</value>
+  </data>
+  <data name="AdvancedChocolateyDialog_IgnoreHttpCache_ToolTip" xml:space="preserve">
+    <value>Ignore any HTTP caches that have previously been created when querying sources, and create new caches.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Source/ChocolateyGui.Common/Providers/ChocolateyConfigurationProvider.cs b/Source/ChocolateyGui.Common/Providers/ChocolateyConfigurationProvider.cs
index ea5cd36f0..294a53431 100644
--- a/Source/ChocolateyGui.Common/Providers/ChocolateyConfigurationProvider.cs
+++ b/Source/ChocolateyGui.Common/Providers/ChocolateyConfigurationProvider.cs
@@ -29,6 +29,9 @@ public ChocolateyConfigurationProvider(IFileSystem fileSystem)
 
         private void GetChocolateyInstallLocation()
         {
+#if DEBUG
+            ChocolateyInstall = _fileSystem.GetDirectoryName(_fileSystem.GetCurrentAssemblyPath());
+#else
             ChocolateyInstall = Environment.GetEnvironmentVariable("ChocolateyInstall");
             if (string.IsNullOrWhiteSpace(ChocolateyInstall))
             {
@@ -46,16 +49,21 @@ private void GetChocolateyInstallLocation()
             {
                 ChocolateyInstall = string.Empty;
             }
+#endif
         }
 
         private void DetermineIfChocolateyExecutableIsBeingUsed()
         {
+#if DEBUG
+            IsChocolateyExecutableBeingUsed = true;
+#else
             var exePath = _fileSystem.CombinePaths(ChocolateyInstall, "choco.exe");
 
             if (_fileSystem.FileExists(exePath))
             {
                 IsChocolateyExecutableBeingUsed = true;
             }
+#endif
         }
     }
 }
\ No newline at end of file
diff --git a/Source/ChocolateyGui.Common/Utilities/TranslationSource.cs b/Source/ChocolateyGui.Common/Utilities/TranslationSource.cs
index f95a01005..f8bff5fd1 100644
--- a/Source/ChocolateyGui.Common/Utilities/TranslationSource.cs
+++ b/Source/ChocolateyGui.Common/Utilities/TranslationSource.cs
@@ -1,4 +1,4 @@
-// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 // <copyright company="Chocolatey" file="TranslationSource.cs">
 //   Copyright 2017 - Present Chocolatey Software, LLC
 //   Copyright 2014 - 2017 Rob Reynolds, the maintainers of Chocolatey, and RealDimensions Software, LLC
@@ -47,6 +47,14 @@ public string this[string key]
         {
             get
             {
+                if (string.IsNullOrEmpty(key))
+                {
+                    // If the key is null we can't pass it to the resource manager.
+                    // As it also doesn't make sense to pass in an empty value we check for both.
+                    // We pass this empty string as we don't want anything to break even on empty values.
+                    return string.Empty;
+                }
+
                 var value = _resourceManager.GetString(key, CurrentCulture);
 #if DEBUG
                 if (string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(key))
diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config
index f636e71aa..f88415d75 100644
--- a/Source/ChocolateyGui.Common/packages.config
+++ b/Source/ChocolateyGui.Common/packages.config
@@ -3,9 +3,10 @@
   <package id="Autofac" version="4.6.1" targetFramework="net452" />
   <package id="AutoMapper" version="7.0.1" targetFramework="net48" />
   <package id="BuildTools.FxCop" version="1.0.1" targetFramework="net452" />
-  <package id="chocolatey.lib" version="2.0.0" targetFramework="net48" />
+  <package id="chocolatey.lib" version="2.1.0" targetFramework="net48" />
   <package id="LiteDB" version="5.0.15" targetFramework="net48" />
   <package id="log4net" version="2.0.12" targetFramework="net452" />
+  <package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="3.3.4" targetFramework="net48" developmentDependency="true" />
   <package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net452" />
   <package id="Serilog" version="2.5.0" targetFramework="net48" />
diff --git a/Source/ChocolateyGui/BannedSymbols.txt b/Source/ChocolateyGui/BannedSymbols.txt
new file mode 100644
index 000000000..c1c3f98a2
--- /dev/null
+++ b/Source/ChocolateyGui/BannedSymbols.txt
@@ -0,0 +1,6 @@
+M:NuGet.Versioning.SemanticVersion.ToFullString;Use ToFullStringChecked() extension method instead.
+M:Chocolatey.NuGet.Versioning.SemanticVersion.ToFullString();Use ToFullStringChecked() extension method instead.
+M:NuGet.Versioning.SemanticVersion.ToNormalizedString;Use ToNormalizedStringChecked() extension method instead.
+M:Chocolatey.NuGet.Versioning.SemanticVersion.ToNormalizedString();Use ToNormalizedStringChecked() extension method instead.
+M:NuGet.Versioning.SemanticVersion.ToString;Use ToNormalizedStringChecked() extension method instead.
+M:Chocolatey.NuGet.Versioning.SemanticVersion.ToString();Use ToNormalizedStringChecked() extension method instead.
\ No newline at end of file
diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj
index 20b305839..d9fe8827d 100644
--- a/Source/ChocolateyGui/ChocolateyGui.csproj
+++ b/Source/ChocolateyGui/ChocolateyGui.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -114,7 +114,7 @@
       <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="chocolatey">
-      <HintPath>..\packages\chocolatey.lib.2.0.0\lib\net48\chocolatey.dll</HintPath>
+      <HintPath>..\packages\chocolatey.lib.2.1.0\lib\net48\chocolatey.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private Condition="'$(Configuration)' != 'Debug'">False</Private>
     </Reference>
@@ -320,6 +320,7 @@
       <SubType>Designer</SubType>
     </None>
     <Resource Include="chocolatey%405.png" />
+    <AdditionalFiles Include="BannedSymbols.txt" />
     <Content Include="ChocolateyGui.exe.manifest">
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -343,6 +344,8 @@
     </CodeAnalysisDictionary>
   </ItemGroup>
   <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.BannedApiAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config
index cb66bc128..e7e430da2 100644
--- a/Source/ChocolateyGui/packages.config
+++ b/Source/ChocolateyGui/packages.config
@@ -5,7 +5,7 @@
   <package id="BuildTools.FxCop" version="1.0.1" targetFramework="net452" />
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
-  <package id="chocolatey.lib" version="2.0.0" targetFramework="net48" />
+  <package id="chocolatey.lib" version="2.1.0" targetFramework="net48" />
   <package id="ControlzEx" version="4.4.0" targetFramework="net48" />
   <package id="Fizzler" version="1.2.0" targetFramework="net48" />
   <package id="HarfBuzzSharp" version="2.6.1.4" targetFramework="net48" />
@@ -20,6 +20,7 @@
   <package id="MahApps.Metro.SimpleChildWindow" version="2.0.0" targetFramework="net48" />
   <package id="Markdig.Signed" version="0.23.0" targetFramework="net48" />
   <package id="Markdig.Wpf.Signed" version="0.5.0.1" targetFramework="net48" />
+  <package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="3.3.4" targetFramework="net48" developmentDependency="true" />
   <package id="Microsoft.NETCore.Platforms" version="3.1.0" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net452" />
diff --git a/Source/ChocolateyGuiCli/Bootstrapper.cs b/Source/ChocolateyGuiCli/Bootstrapper.cs
index 180b0daf0..64c87928f 100644
--- a/Source/ChocolateyGuiCli/Bootstrapper.cs
+++ b/Source/ChocolateyGuiCli/Bootstrapper.cs
@@ -25,13 +25,13 @@ public static class Bootstrapper
 
         // Due to an unknown reason, we can not use chocolateys own get_current_assembly() function here,
         // as it will be returning the path to the choco.exe executable instead.
-        public static readonly string ChocolateyGuiInstallLocation = _fileSystem.get_directory_name(Assembly.GetExecutingAssembly().CodeBase.Replace("file:///", string.Empty));
+        public static readonly string ChocolateyGuiInstallLocation = _fileSystem.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase.Replace("file:///", string.Empty));
         public static readonly string ChocolateyInstallEnvironmentVariableName = "ChocolateyInstall";
-        public static readonly string ChocolateyInstallLocation = System.Environment.GetEnvironmentVariable(ChocolateyInstallEnvironmentVariableName) ?? _fileSystem.get_directory_name(_fileSystem.get_current_assembly_path());
-        public static readonly string LicensedGuiAssemblyLocation = _fileSystem.combine_paths(ChocolateyInstallLocation, "extensions", "chocolateygui", "chocolateygui.licensed.dll");
+        public static readonly string ChocolateyInstallLocation = System.Environment.GetEnvironmentVariable(ChocolateyInstallEnvironmentVariableName) ?? _fileSystem.GetDirectoryName(_fileSystem.GetCurrentAssemblyPath());
+        public static readonly string LicensedGuiAssemblyLocation = _fileSystem.CombinePaths(ChocolateyInstallLocation, "extensions", "chocolateygui", "chocolateygui.licensed.dll");
 
-        public static readonly string ChocolateyGuiCommonAssemblyLocation = _fileSystem.combine_paths(ChocolateyGuiInstallLocation, "ChocolateyGui.Common.dll");
-        public static readonly string ChocolateyGuiCommonWindowsAssemblyLocation = _fileSystem.combine_paths(ChocolateyGuiInstallLocation, "ChocolateyGui.Common.Windows.dll");
+        public static readonly string ChocolateyGuiCommonAssemblyLocation = _fileSystem.CombinePaths(ChocolateyGuiInstallLocation, "ChocolateyGui.Common.dll");
+        public static readonly string ChocolateyGuiCommonWindowsAssemblyLocation = _fileSystem.CombinePaths(ChocolateyGuiInstallLocation, "ChocolateyGui.Common.Windows.dll");
 
         public static readonly string ChocolateyGuiCommonAssemblySimpleName = "ChocolateyGui.Common";
         public static readonly string ChocolateyGuiCommonWindowsAssemblySimpleName = "ChocolateyGui.Common.Windows";
diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj
index dd2c9dadd..c8f3ed792 100644
--- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj
+++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -57,7 +57,7 @@
       <HintPath>..\packages\Autofac.4.6.1\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="chocolatey">
-      <HintPath>..\packages\chocolatey.lib.2.0.0\lib\net48\chocolatey.dll</HintPath>
+      <HintPath>..\packages\chocolatey.lib.2.1.0\lib\net48\chocolatey.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private Condition="'$(Configuration)' != 'Debug'">False</Private>
     </Reference>
@@ -130,8 +130,15 @@
     <SourceRoot Include="$(MSBuildThisFileDirectory)/../" />
   </ItemGroup>
   <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.BannedApiAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.3.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <AdditionalFiles Include="..\ChocolateyGui\BannedSymbols.txt">
+      <Link>BannedSymbols.txt</Link>
+    </AdditionalFiles>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/ChocolateyGuiCli/Runner.cs b/Source/ChocolateyGuiCli/Runner.cs
index 835c63af4..b732ab1a5 100644
--- a/Source/ChocolateyGuiCli/Runner.cs
+++ b/Source/ChocolateyGuiCli/Runner.cs
@@ -69,7 +69,7 @@ public static void Run(string[] args)
                 if (configuration.RegularOutput)
                 {
 #if DEBUG
-                    Bootstrapper.Logger.Warning(" (DEBUG BUILD)".format_with("Chocolatey GUI", configuration.Information.DisplayVersion));
+                    Bootstrapper.Logger.Warning(" (DEBUG BUILD)".FormatWith("Chocolatey GUI", configuration.Information.DisplayVersion));
 #else
                     Bootstrapper.Logger.Warning("{0}".format_with(configuration.Information.DisplayVersion));
 #endif
@@ -159,10 +159,10 @@ private static void SetUpGlobalOptions(IList<string> args, ChocolateyGuiConfigur
                 {
                     var commandsLog = new StringBuilder();
                     var commands = container.Resolve<IEnumerable<ICommand>>();
-                    foreach (var command in commands.or_empty_list_if_null())
+                    foreach (var command in commands.OrEmpty())
                     {
                         var attributes = command.GetType().GetCustomAttributes(typeof(LocalizedCommandForAttribute), false).Cast<LocalizedCommandForAttribute>();
-                        foreach (var attribute in attributes.or_empty_list_if_null())
+                        foreach (var attribute in attributes.OrEmpty())
                         {
                             commandsLog.AppendFormat(" * {0} - {1}\n", attribute.CommandName, attribute.Description);
                         }
@@ -172,7 +172,7 @@ private static void SetUpGlobalOptions(IList<string> args, ChocolateyGuiConfigur
                     Bootstrapper.Logger.Information(string.Empty);
                     Bootstrapper.Logger.Warning(L(nameof(ChocolateyGui.Common.Properties.Resources.Command_CommandsTitle)));
                     Bootstrapper.Logger.Information(string.Empty);
-                    Bootstrapper.Logger.Information("{0}".format_with(commandsLog.ToString()));
+                    Bootstrapper.Logger.Information("{0}".FormatWith(commandsLog.ToString()));
                     Bootstrapper.Logger.Information(L(nameof(ChocolateyGui.Common.Properties.Resources.Command_CommandsText), "chocolateyguicli"));
                     Bootstrapper.Logger.Information(string.Empty);
                     Bootstrapper.Logger.Warning(L(nameof(ChocolateyGui.Common.Properties.Resources.Command_DefaultOptionsAndSwitches)));
@@ -232,7 +232,7 @@ private static void ParseArgumentsAndUpdateConfiguration(
                 {
                     configuration.CommandName = commandName;
                 }
-                else if (commandName.is_equal_to("-v") || commandName.is_equal_to("--version"))
+                else if (commandName.IsEqualTo("-v") || commandName.IsEqualTo("--version"))
                 {
                     // skip help menu
                 }
diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config
index d9137d44f..f5bf25448 100644
--- a/Source/ChocolateyGuiCli/packages.config
+++ b/Source/ChocolateyGuiCli/packages.config
@@ -2,9 +2,10 @@
 <packages>
   <package id="Autofac" version="4.6.1" targetFramework="net452" />
   <package id="BuildTools.FxCop" version="1.0.1" targetFramework="net452" />
-  <package id="chocolatey.lib" version="2.0.0" targetFramework="net48" />
+  <package id="chocolatey.lib" version="2.1.0" targetFramework="net48" />
   <package id="LiteDB" version="5.0.15" targetFramework="net48" />
   <package id="log4net" version="2.0.12" targetFramework="net452" />
+  <package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="3.3.4" targetFramework="net48" developmentDependency="true" />
   <package id="Serilog" version="2.5.0" targetFramework="net48" />
   <package id="Serilog.Sinks.Async" version="1.1.0" targetFramework="net48" />
   <package id="Serilog.Sinks.File" version="3.2.0" targetFramework="net48" />
diff --git a/build.bat b/build.bat
index 23f932eaa..b798ba2d4 100644
--- a/build.bat
+++ b/build.bat
@@ -1,12 +1,11 @@
 @echo off
-setlocal enableextensions enabledelayedexpansion
-set psscript="./build.ps1"
+set psscript="%~dp0build.ps1"
 echo ==================================================
 echo ============= WRAP POWERSHELL SCRIPT =============
 echo ==================================================
 
 echo calling %psscript% with args %*
 PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '%psscript%' %*"
-
+set buildstatus=%ERRORLEVEL%
 echo ==================================================
-endlocal
+exit /b %buildstatus%
\ No newline at end of file
diff --git a/build.debug.bat b/build.debug.bat
index d657e4a4d..417cf087b 100644
--- a/build.debug.bat
+++ b/build.debug.bat
@@ -1,12 +1,11 @@
 @echo off
-setlocal enableextensions enabledelayedexpansion
-set psscript="./build.ps1"
+set psscript="%~dp0build.ps1"
 echo ==================================================
 echo ============= WRAP POWERSHELL SCRIPT =============
 echo ==================================================
 
 echo calling %psscript% with args %*
 PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '%psscript%' -Configuration Debug %*"
-
+set buildstatus=%ERRORLEVEL%
 echo ==================================================
-endlocal
+exit /b %buildstatus%
diff --git a/build.official.bat b/build.official.bat
index c66ad7466..66bad5bb0 100644
--- a/build.official.bat
+++ b/build.official.bat
@@ -1,12 +1,11 @@
 @echo off
-setlocal enableextensions enabledelayedexpansion
-set psscript="./build.ps1"
+set psscript="%~dp0build.ps1"
 echo ==================================================
 echo ============= WRAP POWERSHELL SCRIPT =============
 echo ==================================================
 
 echo calling %psscript% with args %*
-PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '%psscript%' -Configuration ReleaseOfficial -Target CI %*"
-
+PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& '%psscript%' -Configuration ReleaseOfficial %*"
+set buildstatus=%ERRORLEVEL%
 echo ==================================================
-endlocal
+exit /b %buildstatus%
diff --git a/recipe.cake b/recipe.cake
index a003d74a1..10b99d3ff 100644
--- a/recipe.cake
+++ b/recipe.cake
@@ -1,4 +1,4 @@
-#load nuget:?package=Chocolatey.Cake.Recipe&version=0.22.0
+#load nuget:?package=Chocolatey.Cake.Recipe&version=0.23.0
 
 ///////////////////////////////////////////////////////////////////////////////
 // MODULES