diff --git a/Creator/App.config b/Creator/App.config index b34a1ea..3697b26 100644 --- a/Creator/App.config +++ b/Creator/App.config @@ -1,29 +1,29 @@ - + - + - - + + - - + + - - + + - - + + - - + + diff --git a/Creator/KattekerCreator.csproj b/Creator/KattekerCreator.csproj index 978905b..1416e9c 100644 --- a/Creator/KattekerCreator.csproj +++ b/Creator/KattekerCreator.csproj @@ -45,6 +45,9 @@ ..\packages\McMaster.Extensions.CommandLineUtils.2.2.5\lib\net45\McMaster.Extensions.CommandLineUtils.dll + + ..\packages\Vestris.ResourceLib.2.0.0\lib\net45\ResourceLib.dll + @@ -54,9 +57,6 @@ ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - ..\packages\Vestris.ResourceLib.1.6.422\lib\Vestris.ResourceLib.dll - diff --git a/Creator/Program.Arguments.cs b/Creator/Program.Arguments.cs index 8a40ce7..1501456 100644 --- a/Creator/Program.Arguments.cs +++ b/Creator/Program.Arguments.cs @@ -22,6 +22,7 @@ namespace KattekerCreator get => _programFile; set => _programFile = Path.GetFullPath(value); } + [Option("-L|--changelog", Description = "Path of the changelog file")] private string ChangeLog { @@ -50,6 +51,5 @@ namespace KattekerCreator private string FilterAsString { get; set; } private IEnumerable Filter => string.IsNullOrWhiteSpace(FilterAsString) ? Enumerable.Empty() : FilterAsString.Split(';'); - } } \ No newline at end of file diff --git a/Creator/packages.config b/Creator/packages.config index 47b12ae..fc8007a 100644 --- a/Creator/packages.config +++ b/Creator/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Example/Example.csproj b/Example/Example.csproj index cb3676b..d7ceea3 100644 --- a/Example/Example.csproj +++ b/Example/Example.csproj @@ -44,8 +44,8 @@ ..\packages\Autofac.4.8.1\lib\net45\Autofac.dll - - ..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll + + ..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll ..\packages\MaterialDesignThemes.2.4.1.1101\lib\net45\MaterialDesignThemes.Wpf.dll diff --git a/Example/MainWindowViewModel.cs b/Example/MainWindowViewModel.cs index 0de749d..078b005 100644 --- a/Example/MainWindowViewModel.cs +++ b/Example/MainWindowViewModel.cs @@ -13,7 +13,7 @@ namespace Example public class MainWindowViewModel : BindableBase, IDisposable { private bool _showRestartAppDialog; - private UpdateManager _updateManager; + private readonly UpdateManager _updateManager; public MainWindowViewModel() { @@ -32,13 +32,12 @@ namespace Example ShowRestartAppDialog = false; } - private async Task UpdateAsync(string startup) { var silent = bool.Parse(startup); try { - var releases = (await _updateManager.CheckForUpdateAsync()).ToList(); + var releases = (await _updateManager.CheckForUpdateAsync().ConfigureAwait(false)).ToList(); if (releases.Any()) { MessageQueue.Enqueue("Update available", "Update now", ActionHandler); @@ -61,8 +60,7 @@ namespace Example { if (await _updateManager.UpdateAppAsync().ConfigureAwait(false)) { - ShowRestartAppDialog = true; - //manager.RestartApp(); + ShowRestartAppDialog = true; } } diff --git a/Example/Properties/AssemblyInfo.cs b/Example/Properties/AssemblyInfo.cs index 5fa03f4..b1a232d 100644 --- a/Example/Properties/AssemblyInfo.cs +++ b/Example/Properties/AssemblyInfo.cs @@ -28,7 +28,6 @@ using System.Windows; //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located //(used if a resource is not found in the page, @@ -38,7 +37,6 @@ using System.Windows; // app, or any theme specific resource dictionaries) )] - // Version information for an assembly consists of the following four values: // // Major Version diff --git a/Example/packages.config b/Example/packages.config index 25ca2a4..86f383f 100644 --- a/Example/packages.config +++ b/Example/packages.config @@ -2,7 +2,7 @@ - + diff --git a/Katteker.Gui/Katteker.UserInterface.csproj b/Katteker.Gui/Katteker.UserInterface.csproj index ddc127d..aa053a8 100644 --- a/Katteker.Gui/Katteker.UserInterface.csproj +++ b/Katteker.Gui/Katteker.UserInterface.csproj @@ -59,7 +59,6 @@ - diff --git a/Katteker.Gui/packages.config b/Katteker.Gui/packages.config deleted file mode 100644 index 82a1859..0000000 --- a/Katteker.Gui/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file