From c23fd4986d6d14ca8d30a6e52194c6838f1002ac Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Mon, 6 Mar 2017 06:17:11 +0100 Subject: [PATCH 1/4] Fix SettingsRepositoryTest. --- Tests/Controller/SettingsRepositoryTest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/Controller/SettingsRepositoryTest.cs b/Tests/Controller/SettingsRepositoryTest.cs index 6e70650..1481415 100755 --- a/Tests/Controller/SettingsRepositoryTest.cs +++ b/Tests/Controller/SettingsRepositoryTest.cs @@ -27,18 +27,18 @@ namespace Tests.Controller [TestFixture] class SettingsRepositoryTest { - string _savedSettings; + SettingsRepository _savedRepository; [SetUp] public void SetUp() { - _savedSettings = zaaReloaded2.UserSettings.Default.SettingsRepository; + _savedRepository = zaaReloaded2.UserSettings.Default.SettingsRepository; } [TearDown] public void TearDown() { - zaaReloaded2.UserSettings.Default.SettingsRepository = _savedSettings; + zaaReloaded2.UserSettings.Default.SettingsRepository = _savedRepository; zaaReloaded2.UserSettings.Default.Save(); } From 12bb372137a34daa106551b12de1ee32f57c1681 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Mon, 6 Mar 2017 06:17:24 +0100 Subject: [PATCH 2/4] Use 500 ms delay to display FirstRunView. --- zaaReloaded2/ThisAddIn.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zaaReloaded2/ThisAddIn.cs b/zaaReloaded2/ThisAddIn.cs index 7e188b6..50c4b34 100755 --- a/zaaReloaded2/ThisAddIn.cs +++ b/zaaReloaded2/ThisAddIn.cs @@ -95,7 +95,7 @@ namespace zaaReloaded2 { _dispatcher.Invoke((Action)(() => ViewModels.FirstRunViewModel.InjectIntoIfNeeded()), null); - }, null, 1000, System.Threading.Timeout.Infinite); + }, null, 500, System.Threading.Timeout.Infinite); Logger.Info("ThisAddIn_Startup: Finished startup"); } From 118a822332803511bc883254962c90f0f5194313 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Mon, 6 Mar 2017 06:19:25 +0100 Subject: [PATCH 3/4] Bump version, write history. --- HISTORY.md | 8 ++++++++ zaaReloaded2/VERSION | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 676ce45..86786f5 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,11 @@ +Version 2.3.2 (2017-03-06) +------------------------------------------------------------------------ + +- Repariert: Willkommensdialog mit der Auswahl des Modus wurde technisch nicht gut angezeigt. + +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + + Version 2.3.1 (2017-03-03) ------------------------------------------------------------------------ diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION index 525aee1..7e5c979 100755 --- a/zaaReloaded2/VERSION +++ b/zaaReloaded2/VERSION @@ -1,2 +1,2 @@ -2.3.1 -2.3.1.0 +2.3.2 +2.3.2.0 From b417107d33144d49bc53c9b449aa9622f0a514fb Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Mon, 6 Mar 2017 06:19:46 +0100 Subject: [PATCH 4/4] Write version info. --- www/versioninfo.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/versioninfo.txt b/www/versioninfo.txt index edd4521..603c622 100644 --- a/www/versioninfo.txt +++ b/www/versioninfo.txt @@ -1,4 +1,4 @@ -2.3.1 +2.3.2 https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe -21c3a526191ec71fe8681a447b54d2447de4e69c54e44d1ab27d6fbf2a05f7c3 deploy/releases/zaaReloaded-2.3.1.exe +49d8383326222a88ce447a7c97eba596ffd5782f307f8730ffac83743821949f deploy/releases/zaaReloaded-2.3.2.exe