Skip to content

Commit

Permalink
Merge branch 'release/0.18.0' into master
Browse files Browse the repository at this point in the history
* release/0.18.0: (113 commits)
  (GH-821) Fix logic of IsShowOnlyPackagesWithUpdateEnabled when PreventAutomatedOutdatedPackages is not set
  (#820) Split default values for global and user
  (#741) Ensure all settings are included
  (maint) Remove unnecessary whitespace
  (#601) Change default for admin settings access
  (#820) Change default for tile view
  (#757) Allow buttons to be enabled/disabled
  (GH-685) Fix setting IsShowOnlyPackagesWithUpdateEnabled in local view
  (GH-685) Create converters only once
  (GH-685) Improve standard remote view
  (GH-685) Make converters more robust
  (GH-685) Add option to set default for dark mode
  (GH-685) Fix missing theme change in SyncTheme
  (GH-685) Update MahApps package
  (GH-685) Add ThemeMode and own ToggleSwitch with icons for dark and light mode
  (GH-685) Introduce IBundledThemeService
  (GH-685) Add better ScrollBar and ScrollViewer styles
  (GH-685) Improve progress dialog
  (GH-685) Add additional Chocolatey colors and brushes
  (GH-685) Remove obsolete unused styles
  ...
  • Loading branch information
gep13 committed Mar 9, 2021
2 parents 63b22a6 + 7c94a89 commit 3d49015
Show file tree
Hide file tree
Showing 204 changed files with 4,460 additions and 4,045 deletions.
4 changes: 3 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
image: Visual Studio 2019

#---------------------------------#
# Build Script #
#---------------------------------#

build_script:
- ps: .\build.ps1 --bootstrap
- ps: .\build.ps1 -Target ContinuousIntegration
- ps: .\build.ps1 -Target CI

#---------------------------------#
# Tests
Expand Down
11 changes: 8 additions & 3 deletions ABOUT.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
## History

Chocolatey GUI, formerly known as Chocolatey Explorer or Chocolatey PackageManager, was originally created by [Christiaan Baes](https://twitter.com/chrissie1).
Chocolatey GUI, formerly known as Chocolatey Explorer or Chocolatey PackageManager, was originally created by [Christiaan Baes](https://twitter.com/chrissie1). For information about the original version, you can see the following blog posts:

In 2013, Christiaan handed over maintenance of Chocolatey GUI to [Gary Ewan Park](https://www.gep13.co.uk/about), who later, under the supervision of [Rob Reynolds](https://twitter.com/ferventcoder) (creator of [Chocolatey](https://chocolatey.org/)), brought the application under the main Chocolatey Organisation on [GitHub](https://github.com/chocolatey).
* [All new Chocolatey GUI](http://blogs.lessthandot.com/index.php/SysAdmins/OS/Windows/all-new-chocolateygui/)
* [Making a chocolatey package for Chocolatey GUI](http://blogs.lessthandot.com/index.php/DesktopDev/MSTech/making-a-chocolatey-package/)
* [Chocolatey GUI](http://blogs.lessthandot.com/index.php/DesktopDev/MSTech/chocolatey-gui/)

In 2013, Christiaan handed over maintainance of Chocolatey GUI to [Gary Ewan Park](http://www.gep13.co.uk/about/), who later, under the supervision of [Rob Reynolds](https://twitter.com/ferventcoder) (creator of [Chocolatey](https://chocolatey.org/)), brought the application under the main Chocolatey Organisation on [GitHub](https://github.com/chocolatey).

Since then, with a set of major contributions from [Richard Simpson](https://twitter.com/richardsimp), Chocolatey GUI has changed from a Windows Forms application to a WPF application, with a much richer User Interface.

## Support
If you have any questions/concerns/problems with Chocolatey GUI, please feel free to get in touch with us. The best starting place would be our [Gitter Chat Room](https://gitter.im/chocolatey/ChocolateyGUI), and from there, you may be directed to raise an issue on our [Issues List](https://github.com/chocolatey/ChocolateyGUI/issues).

If you have any questions, comments, concerns, or problems with Chocolatey GUI, please feel free to get in touch with us. The best starting place would be our [Gitter Chat Room](https://gitter.im/chocolatey/ChocolateyGUI), and from there, you may be directed to raise an issue on our [Issues List](https://github.com/chocolatey/ChocolateyGUI/issues).
29 changes: 17 additions & 12 deletions docs/input/credits.md → CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,39 +19,44 @@ These are the committers to Chocolatey/Chocolatey GUI repository:

## Frameworks

Chocolatey GUI uses the following awesome frameworks (in no particular order):
Chocolatey GUI uses the following awesome frameworks:

* [Autofac](http://autofac.org/)
* [AutoMapper](http://automapper.org/)
* [Caliburn.Micro](https://github.com/Caliburn-Micro/Caliburn.Micro)
* [ControlzEx](https://github.com/ControlzEx/ControlzEx)
* [LiteDB](https://github.com/mbdavid/LiteDB)
* [corefx](https://github.com/dotnet/runtime)
* [Fizzler](https://github.com/atifaziz/Fizzler)
* [IconPacks](https://github.com/MahApps/MahApps.Metro.IconPacks)
* [LiteDB](https://www.litedb.org/)
* [log4net](http://logging.apache.org/log4net/)
* [Magick.NET](https://github.com/dlemstra/Magick.NET)
* [MahApps.Metro](http://mahapps.com/)
* [Markdig](https://github.com/lunet-io/markdig)
* [Markdig.Wpf](https://github.com/Kryptos-FR/markdig.wpf)
* [Reactive Extenstions for .NET](https://github.com/dotnet/reactive)
* [Serilog](https://github.com/serilog/serilog)
* [Splat](https://github.com/paulcbetts/splat)
* [Splat](https://github.com/reactiveui/splat)
* [SkiaSharp](https://github.com/mono/SkiaSharp)
* [Svg.Skia](https://github.com/wieslawsoltes/Svg.Skia)
* [XamlBehaviorsWpf](https://github.com/Microsoft/XamlBehaviorsWpf)

Chocolatey GUI is built, with the following fantastic frameworks and services (in no particular order):
Chocolatey GUI is built, with the following fantastic frameworks and services:

* [AppVeyor](http://www.appveyor.com/)
* [Cake](http://cakebuild.net/)
* [Cake.Recipe](https://github.com/cake-contrib/Cake.Recipe)
* [NuGet.exe](https://www.nuget.org/)
* [AppVeyor](http://www.appveyor.com/)
* [MyGet](http://www.myget.org/)
* [NuGet.exe](https://www.nuget.org/)

Chocolatey GUI is tested and analyzed with the following rockstar frameworks (in no particular order):
Chocolatey GUI is tested and analyzed with the following rockstar frameworks:

* [DupFinder](https://confluence.jetbrains.com/display/NETCOM/Introducing+dupFinder)
* [FxCop](https://msdn.microsoft.com/en-us/library/bb429476(v=vs.80).aspx)
* [StyleCop.Analyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers)
* [InspectCode](https://confluence.jetbrains.com/display/NETCOM/Introducing+InspectCode)
* [DupFinder](https://confluence.jetbrains.com/display/NETCOM/Introducing+dupFinder)
* [StyleCop.Analyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers)

We would like to credit other super sweet tools/frameworks/services that aid in the development of Chocolatey GUI:

* [ReSharper](https://www.jetbrains.com/resharper/)
* [NuGet Framework](https://www.nuget.org/)
* [Gitter](https://gitter.im)
* [NuGet Framework](https://www.nuget.org/)
* [ReSharper](https://www.jetbrains.com/resharper/)
19 changes: 14 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Or, you can find us in IRC at #chocolatey.

### Documentation

You can find information about Chocolatey GUI here: [https://chocolatey.github.io/ChocolateyGUI/](https://chocolatey.github.io/ChocolateyGUI/)
You can find information about Chocolatey GUI here: [https://docs.chocolatey.org/en-us/chocolatey-gui/](https://docs.chocolatey.org/en-us/chocolatey-gui/)

### Requirements

Expand Down Expand Up @@ -77,10 +77,19 @@ If you would like to contribute code or help squash a bug or two, that's awesome

### Building

* It is assumed that a version of Visual Studio 2017 is already installed on the machine being used to complete the build
* It is assumed that a version of Visual Studio 2019 is already installed on the machine being used to complete the build.
* `choco install wixtoolset -y`
* **OPTIONAL:** If you have Visual Studio 2017 installed, you may need to set `FXCOPDIR` environment variable. You can typically find that at `"C:\Program Files (x86)\Microsoft Visual Studio\2017\<sku>\Team Tools\Static Analysis Tools\FxCop\FxCopCmd.exe"`. Run something like `[Environment]::SetEnvironmentVariable("FXCOPDIR","C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\FxCop", 'User')` (for build machines, use `Machine` instead of `User`).
* From and Administrative PowerShell Window, navigate to the folder where you have cloned the Chocolatey GUI repository and run `build.ps1`, this will run Cake and it will go through the build script.
* **OPTIONAL:** Set `FXCOPDIR` environment variable, which can be set using [vswhere](https://chocolatey.org/packages/vswhere) and the following command:
```ps1
$FXCOPDIR = vswhere -products * -latest -prerelease -find **/FxCopCmd.exe
[Environment]::SetEnvironmentVariable("FXCOPDIR", $FXCOPDIR, 'User')
refreshenv
```
* Install WiX toolset integration for your Visual Studio Integration from [here](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2019Extension)
* From and **Administrative** PowerShell Window, navigate to the folder where you have cloned the Chocolatey GUI repository and run `build.ps1`, this will run Cake and it will go through the build script.
```
./build.ps1
```

### Localization

Expand All @@ -101,4 +110,4 @@ Committers, you should be very familiar with [COMMITTERS](https://github.com/cho

## Credits

Chocolatey GUI is brought to you by quite a few people and frameworks. See [CREDITS](https://github.com/chocolatey/chocolateygui/blob/develop/docs/input/credits.md) (just input/credits.md in the zip folder)
Chocolatey GUI is brought to you by quite a few people and frameworks. See [CREDITS](https://github.com/chocolatey/chocolateygui/blob/develop/CREDITS.md) (just CREDITS.md in the zip folder)
22 changes: 13 additions & 9 deletions Source/ChocolateyGui.Common.Windows/Bootstrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,15 @@ public Bootstrapper()

public static bool IsExiting { get; private set; }

internal static string ApplicationFilesPath { get; } = Path.GetDirectoryName((Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()).Location);
public static string ApplicationFilesPath { get; } = Path.GetDirectoryName((Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()).Location);

internal static string AppDataPath { get; } = LogSetup.GetAppDataPath(Name);
public static string AppDataPath { get; } = LogSetup.GetAppDataPath(Name);

internal static string LocalAppDataPath { get; } = LogSetup.GetLocalAppDataPath(Name);
public static string LocalAppDataPath { get; } = LogSetup.GetLocalAppDataPath(Name);

public static string UserConfigurationDatabaseName { get; } = "UserDatabase";

public static string GlobalConfigurationDatabaseName { get; } = "GlobalDatabase";

public Task OnExitAsync()
{
Expand Down Expand Up @@ -129,8 +133,8 @@ protected override async void OnStartup(object sender, StartupEventArgs e)
}
catch (Exception ex)
{
MessageBox.Show($"Failed to start application.\n{ex.Message}\n\nMore details available in application logs.");
Logger.Fatal(ex, "Failed to start application.");
MessageBox.Show(string.Format(Resources.Fatal_Startup_Error_Formatted, ex.Message));
Logger.Fatal(ex, Resources.Fatal_Startup_Error);
await OnExitAsync();
}
}
Expand All @@ -157,7 +161,7 @@ protected override object GetInstance(Type service, string key)
}
}

throw new Exception($"Could not locate any instances of contract {key ?? service.Name}.");
throw new Exception(string.Format(Resources.Application_ContainerError, key ?? service.Name));
}

protected override IEnumerable<object> GetAllInstances(Type service)
Expand All @@ -172,14 +176,14 @@ protected override void BuildUp(object instance)

protected override void OnExit(object sender, EventArgs e)
{
Logger.Information("Exiting.");
Logger.Information(Resources.Application_Exiting);
}

private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
if (e.IsTerminating)
{
Logger.Fatal("Unhandled Exception", e.ExceptionObject as Exception);
Logger.Fatal(Resources.Application_UnhandledException, e.ExceptionObject as Exception);
if (IsExiting)
{
return;
Expand All @@ -195,7 +199,7 @@ private static void CurrentDomain_UnhandledException(object sender, UnhandledExc
}
else
{
Logger.Error("Unhandled Exception", e.ExceptionObject as Exception);
Logger.Error(Resources.Application_UnhandledException, e.ExceptionObject as Exception);
}
}
}
Expand Down
Loading

0 comments on commit 3d49015

Please sign in to comment.