From 50bc82c94ba7a9e08877377b423531caa20c736d Mon Sep 17 00:00:00 2001 From: Michael Scrivo Date: Fri, 18 Aug 2017 21:03:26 -0400 Subject: [PATCH] Prep for 3.5.2 Release --- OutlookDesktop/Forms/MainForm.cs | 1 + OutlookDesktop/Properties/AssemblyInfo.cs | 4 ++-- OutlookDesktop/app.manifest | 2 +- ServerStaging/ootdAppcastx64.xml | 6 +++--- ServerStaging/ootdAppcastx86.xml | 4 ++-- ServerStaging/ootdReleaseNotes.md | 5 +++++ Setup Script x64.iss | 12 ++++++------ Setup Script.iss | 12 ++++++------ 8 files changed, 26 insertions(+), 20 deletions(-) diff --git a/OutlookDesktop/Forms/MainForm.cs b/OutlookDesktop/Forms/MainForm.cs index bcc2d09..3766bbc 100644 --- a/OutlookDesktop/Forms/MainForm.cs +++ b/OutlookDesktop/Forms/MainForm.cs @@ -526,6 +526,7 @@ private void DefaultFolderTypesClicked(FolderViewType folderViewType, ToolStripM /// private void ShowToolbarButtonsFor(string folderPath) { + Logger.Info($"Outlook folder path: {folderPath}"); switch (folderPath) { // ReSharper disable once PatternAlwaysOfType diff --git a/OutlookDesktop/Properties/AssemblyInfo.cs b/OutlookDesktop/Properties/AssemblyInfo.cs index d923617..b713c62 100644 --- a/OutlookDesktop/Properties/AssemblyInfo.cs +++ b/OutlookDesktop/Properties/AssemblyInfo.cs @@ -29,8 +29,8 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.5.1")] -[assembly: AssemblyFileVersion("3.5.1")] +[assembly: AssemblyVersion("3.5.2")] +[assembly: AssemblyFileVersion("3.5.2")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/OutlookDesktop/app.manifest b/OutlookDesktop/app.manifest index 82410d1..2337d38 100644 --- a/OutlookDesktop/app.manifest +++ b/OutlookDesktop/app.manifest @@ -1,6 +1,6 @@  - + diff --git a/ServerStaging/ootdAppcastx64.xml b/ServerStaging/ootdAppcastx64.xml index 000c942..eeecd1c 100644 --- a/ServerStaging/ootdAppcastx64.xml +++ b/ServerStaging/ootdAppcastx64.xml @@ -6,12 +6,12 @@ Most recent changes with links to updates. en - Version 3.5.1 + Version 3.5.2 http://www.outlookonthedesktop.com/ootdReleaseNotes.md - Mon, 10 Apr 2017 21:05:00 +0000 - + Mon, 18 Aug 2017 21:00:00 +0000 + \ No newline at end of file diff --git a/ServerStaging/ootdAppcastx86.xml b/ServerStaging/ootdAppcastx86.xml index 2149d79..6d4c10d 100644 --- a/ServerStaging/ootdAppcastx86.xml +++ b/ServerStaging/ootdAppcastx86.xml @@ -6,12 +6,12 @@ Most recent changes with links to updates. en - Version 3.5.1 + Version 3.5.2 http://www.outlookonthedesktop.com/ootdReleaseNotes.md Mon, 10 Apr 2017 21:05:00 +0000 - + \ No newline at end of file diff --git a/ServerStaging/ootdReleaseNotes.md b/ServerStaging/ootdReleaseNotes.md index 1a2eea1..485a357 100644 --- a/ServerStaging/ootdReleaseNotes.md +++ b/ServerStaging/ootdReleaseNotes.md @@ -1,5 +1,10 @@ # Outlook on the Desktop Release Notes +## 3.5.2 +* Fixed additional HiDPI scaling issues (courtesy of .NET 4.7 Framework). +* Fixed an issue where update release notes did not render properly. +* Added additional logging + ## 3.5.1 * Fixed issue where instances would not show up on monitors that had difference scaling factor than main monitor. * Fixed issue where calendar buttons were not showing up on custom calendars. diff --git a/Setup Script x64.iss b/Setup Script x64.iss index 50d7412..dcce6d5 100644 --- a/Setup Script x64.iss +++ b/Setup Script x64.iss @@ -1,8 +1,8 @@ #include #define MyAppName "Outlook on the Desktop" -#define MyAppVersion "3.5.1" -#define MyAppVerName "Outlook on the Desktop 3.5.1" +#define MyAppVersion "3.5.2" +#define MyAppVerName "Outlook on the Desktop 3.5.2" #define MyAppPublisher "Michael Scrivo" #define MyAppURL "https://outlookonthedesktop.com" #define MyAppExeName "OutlookDesktop.exe" @@ -49,7 +49,7 @@ Name: eng; MessagesFile: compiler:Default.isl Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{app}"; Flags: postinstall skipifsilent nowait runasoriginaluser unchecked; Description: "{cm:LaunchProgram,{#MyAppName}}" [Tasks] -Name: installdotnet; Description: Download and Install Microsoft .NET Framework 4.6.2; Check: NeedsDotNetFramework +Name: installdotnet; Description: Download and Install Microsoft .NET Framework 4.7; Check: NeedsDotNetFramework [Files] Source: "OutlookDesktop\bin\x64\Release\OutlookDesktop.exe"; DestDir: "{app}"; Flags: ignoreversion @@ -77,9 +77,9 @@ Name: "{app}\logs"; Permissions: everyone-modify [Code] const - dotnetURL = 'https://download.microsoft.com/download/D/5/C/D5C98AB0-35CC-45D9-9BA5-B18256BA2AE6/NDP462-KB3151802-Web.exe'; + dotnetURL = 'https://download.microsoft.com/download/A/E/A/AEAE0F3F-96E9-4711-AADA-5E35EF902306/NDP47-KB3186500-Web.exe'; const - sFileName = 'D5C98AB0-35CC-45D9-9BA5-B18256BA2AE6/NDP462-KB3151802-Web.exe'; + sFileName = 'AEAE0F3F-96E9-4711-AADA-5E35EF902306/NDP47-KB3186500-Web.exe'; function NeedsDotNetFramework(): Boolean; var @@ -92,7 +92,7 @@ begin begin if RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', ReleaseVersion) then begin - if (ReleaseVersion >= 394802) then + if (ReleaseVersion >= 460798) then begin tempResult := False; end; diff --git a/Setup Script.iss b/Setup Script.iss index f07b944..da04e80 100644 --- a/Setup Script.iss +++ b/Setup Script.iss @@ -1,8 +1,8 @@ #include #define MyAppName "Outlook on the Desktop" -#define MyAppVersion "3.5.1" -#define MyAppVerName "Outlook on the Desktop 3.5.1" +#define MyAppVersion "3.5.2" +#define MyAppVerName "Outlook on the Desktop 3.5.2" #define MyAppPublisher "Michael Scrivo" #define MyAppURL "https://outlookonthedesktop.com" #define MyAppExeName "OutlookDesktop.exe" @@ -47,7 +47,7 @@ Name: eng; MessagesFile: compiler:Default.isl Filename: "{app}\{#MyAppExeName}"; WorkingDir: "{app}"; Flags: postinstall skipifsilent nowait runasoriginaluser unchecked; Description: "{cm:LaunchProgram,{#MyAppName}}" [Tasks] -Name: installdotnet; Description: Download and Install Microsoft .NET Framework 4.6.2; Check: NeedsDotNetFramework +Name: installdotnet; Description: Download and Install Microsoft .NET Framework 4.7; Check: NeedsDotNetFramework [Files] Source: "OutlookDesktop\bin\x86\Release\OutlookDesktop.exe"; DestDir: {app}; Flags: ignoreversion @@ -75,9 +75,9 @@ Name: "{app}\logs"; Permissions: everyone-modify [Code] const - dotnetURL = 'https://download.microsoft.com/download/D/5/C/D5C98AB0-35CC-45D9-9BA5-B18256BA2AE6/NDP462-KB3151802-Web.exe'; + dotnetURL = 'https://download.microsoft.com/download/A/E/A/AEAE0F3F-96E9-4711-AADA-5E35EF902306/NDP47-KB3186500-Web.exe'; const - sFileName = 'D5C98AB0-35CC-45D9-9BA5-B18256BA2AE6/NDP462-KB3151802-Web.exe'; + sFileName = 'AEAE0F3F-96E9-4711-AADA-5E35EF902306/NDP47-KB3186500-Web.exe'; function NeedsDotNetFramework(): Boolean; var @@ -90,7 +90,7 @@ begin begin if RegQueryDWordValue(HKLM, 'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', ReleaseVersion) then begin - if (ReleaseVersion >= 394802) then + if (ReleaseVersion >= 460798) then begin tempResult := False; end;