Prep for 3.5.2 Release

mscrivo · Aug 19, 2017 · 50bc82c · 50bc82c
1 parent 6137d38
commit 50bc82c
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 20 deletions.
diff --git a/OutlookDesktop/Forms/MainForm.cs b/OutlookDesktop/Forms/MainForm.cs
@@ -526,6 +526,7 @@ private void DefaultFolderTypesClicked(FolderViewType folderViewType, ToolStripM
         /// <param name="folderPath"></param>
         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
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <assemblyIdentity version="3.5.1.0" name="OutlookDesktop.app"/>
+  <assemblyIdentity version="3.5.2.0" name="OutlookDesktop.app"/>
 
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">

diff --git a/ServerStaging/ootdAppcastx64.xml b/ServerStaging/ootdAppcastx64.xml
@@ -6,12 +6,12 @@
     <description>Most recent changes with links to updates.</description>
     <language>en</language>
     <item>
-      <title>Version 3.5.1</title>
+      <title>Version 3.5.2</title>
       <sparkle:releaseNotesLink>
         http://www.outlookonthedesktop.com/ootdReleaseNotes.md
       </sparkle:releaseNotesLink>
-      <pubDate>Mon, 10 Apr 2017 21:05:00 +0000</pubDate>
-      <enclosure url="https://github.com/mscrivo/ootd/releases/download/3.5.1/ootd-3.5.1-x64.exe" sparkle:version="3.5.1" length="2012133" type="application/octet-stream" />
+      <pubDate>Mon, 18 Aug 2017 21:00:00 +0000</pubDate>
+      <enclosure url="https://github.com/mscrivo/ootd/releases/download/3.5.2/ootd-3.5.2-x64.exe" sparkle:version="3.5.2" length="2015528" type="application/octet-stream" />
     </item>   
   </channel>
 </rss>
diff --git a/ServerStaging/ootdAppcastx86.xml b/ServerStaging/ootdAppcastx86.xml
@@ -6,12 +6,12 @@
     <description>Most recent changes with links to updates.</description>
     <language>en</language>
     <item>
-      <title>Version 3.5.1</title>
+      <title>Version 3.5.2</title>
       <sparkle:releaseNotesLink>
         http://www.outlookonthedesktop.com/ootdReleaseNotes.md
       </sparkle:releaseNotesLink>
       <pubDate>Mon, 10 Apr 2017 21:05:00 +0000</pubDate>
-      <enclosure url="https://github.com/mscrivo/ootd/releases/download/3.5.1/ootd-3.5.1.exe" sparkle:version="3.5.1" length="2011723" type="application/octet-stream" />
+      <enclosure url="https://github.com/mscrivo/ootd/releases/download/3.5.2/ootd-3.5.2.exe" sparkle:version="3.5.2" length="2,015,528" type="application/octet-stream" />
     </item>   
   </channel>
 </rss>
diff --git 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
@@ -1,8 +1,8 @@
 #include <idp.iss>
 
 #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
@@ -1,8 +1,8 @@
 #include <idp.iss>
 
 #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;