v2.9.2

phw198 · Nov 14, 2021 · 5bf13d7 · 5bf13d7
1 parent bd12706
commit 5bf13d7
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -29,17 +29,17 @@ If you find a bug, [help squash it](https://github.com/phw198/OutlookGoogleCalen
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.0-beta/OutlookGoogleCalendarSync-2.9.0-beta-full.nupkg.svg)  
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.0-beta/OutlookGoogleCalendarSync-2.9.0-beta-delta.nupkg.svg)
 
-### Latest Alpha Release: [![Latest Release](https://img.shields.io/github/release/phw198/OutlookGoogleCalendarSync/all.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.9.1-alpha) [![Latest Release downloads](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.1-alpha/total.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/v2.9.1-alpha)
+### Latest Alpha Release: [![Latest Release](https://img.shields.io/github/release/phw198/OutlookGoogleCalendarSync/all.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.9.2-alpha) [![Latest Release downloads](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.2-alpha/total.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/v2.9.2-alpha)
 
-:floppy_disk: [Installer](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.9.1-alpha/Setup.exe)  
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.1-alpha/Setup.exe.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.9.1-alpha/Setup.exe)
+:floppy_disk: [Installer](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.9.2-alpha/Setup.exe)  
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.2-alpha/Setup.exe.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.9.2-alpha/Setup.exe)
 
-:package: [Portable ZIP](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.9.1-alpha/Portable_OGCS_v2.9.1.zip)  
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.1-alpha/Portable_OGCS_v2.9.1.zip.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.9.1-alpha/Portable_OGCS_v2.9.1.zip)
+:package: [Portable ZIP](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.9.2-alpha/Portable_OGCS_v2.9.2.zip)  
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.2-alpha/Portable_OGCS_v2.9.2.zip.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.9.2-alpha/Portable_OGCS_v2.9.2.zip)
 
 :information_source: Upgrades to this release  
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.1-alpha/OutlookGoogleCalendarSync-2.9.1-alpha-full.nupkg.svg)  
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.1-alpha/OutlookGoogleCalendarSync-2.9.1-alpha-delta.nupkg.svg)
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.2-alpha/OutlookGoogleCalendarSync-2.9.2-alpha-full.nupkg.svg)  
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.2-alpha/OutlookGoogleCalendarSync-2.9.2-alpha-delta.nupkg.svg)
 
 ## Functionality
 - Supports all versions of Outlook from 2003 to 2019/Microsoft365 64-bit!

diff --git a/docs/Release Notes.md b/docs/Release Notes.md
@@ -1,6 +1,17 @@
 | Release Notes |
 |:---|
 
+# v2.9.2.0 - Alpha
+
+**Enhancements**
+- Don't steal focus for messageboxes, flash icon instead
+- Improved UX for category/colour map tests
+- Proactively offer hiding of splash screen following donation
+
+**Bugfix**
+- Fix missing Google default notification in Outlook appointment
+- Fix "the given key was not in the dictionary"
+
 # v2.9.1.0 - Alpha
 
 **Enhancements**

diff --git a/docs/latest_zip_release.md b/docs/latest_zip_release.md
@@ -1,3 +1,3 @@
 # Latest ZIP Release
-**Alpha**: [v2.9.1.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.9.1-alpha)  
+**Alpha**: [v2.9.2.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.9.2-alpha)  
 **Beta**: [v2.9.0.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/latest)
diff --git a/nuget-build.bat b/nuget-build.bat
@@ -1,4 +1,6 @@
-set RELEASE=2.9.1-alpha
+set RELEASE=2.9.2-alpha
+
+REM Check for new NodaTime DB @ http://nodatime.org/tzdb/latest.txt
 
 cd src
 del Releases\OutlookGoogleCalendarSync-%RELEASE%-full.nupkg
@@ -11,22 +13,23 @@ REM src\packages\squirrel.windows.1.9.0\tools\signtool.exe sign /n "Open Source
 
 REM In VS Package Manager
 REM PM> Install-Package squirrel.windows -Version 1.9.0
-REM PM> packages\squirrel.windows.1.9.0\tools\Squirrel --releasify OutlookGoogleCalendarSync.2.9.1-alpha.nupkg --no-msi --loadingGif=..\docs\images\ogcs128x128-animated.gif
+REM PM> packages\squirrel.windows.1.9.0\tools\Squirrel --releasify OutlookGoogleCalendarSync.2.9.2-alpha.nupkg --no-msi --loadingGif=..\docs\images\ogcs128x128-animated.gif
 
 REM Sign the Squirrel install executable
 REM src\packages\squirrel.windows.1.9.0\tools\signtool.exe sign /n "Open Source Developer, Paul Woolcock" /tr http://time.certum.pl/ /td sha256 /fd sha256 /v src\Releases\Setup.exe
 
 REM Build ZIP
 PAUSE
 cd src\OutlookGoogleCalendarSync\bin\Release
-"c:\Program Files\7-Zip\7z.exe" u Portable_OGCS_v2.9.0.zip -u- -up0q0r2x2y2z1w2!Portable_OGCS_v2.9.1.zip *.dll *.ps1 ErrorReportingTemplate.json logger.xml tzdb.nzd OutlookGoogleCalendarSync.exe OutlookGoogleCalendarSync.exe.config OutlookGoogleCalendarSync.pdb Console\* 
+del Portable_OGCS_v2.9.2.zip
+"c:\Program Files\7-Zip\7z.exe" u Portable_OGCS_v2.9.1.zip -u- -up0q0r2x2y2z1w2!Portable_OGCS_v2.9.2.zip *.dll *.ps1 ErrorReportingTemplate.json logger.xml tzdb.nzd OutlookGoogleCalendarSync.exe OutlookGoogleCalendarSync.exe.config OutlookGoogleCalendarSync.pdb Console\* 
 
-"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.9.0.zip Microsoft.Office.Interop.Outlook.DLL
-"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.9.0.zip stdole.dll
-"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.9.0.zip "Windows Defender SmartScreen Unblock.ps1"
+"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.9.1.zip Microsoft.Office.Interop.Outlook.DLL
+"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.9.1.zip stdole.dll
+"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.9.1.zip "Windows Defender SmartScreen Unblock.ps1"
 
-"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.9.1.zip Microsoft.Office.Interop.Outlook.DLL
-"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.9.1.zip stdole.dll
-"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.9.1.zip "Windows Defender SmartScreen Unblock.ps1"
+"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.9.2.zip Microsoft.Office.Interop.Outlook.DLL
+"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.9.2.zip stdole.dll
+"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.9.2.zip "Windows Defender SmartScreen Unblock.ps1"
 
 cd ..\..\..\..
diff --git a/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec b/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>OutlookGoogleCalendarSync</id>
-    <version>2.9.1-alpha</version>
+    <version>2.9.2-alpha</version>
     <title>Outlook Google Calendar Sync</title>
     <authors>Paul Woolcock</authors>
     <owners>phw198</owners>
@@ -12,19 +12,21 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Sync Outlook and Google calendars.</description>
     <releaseNotes>
-# What's New In v2.9.1?
+# What's New In v2.9.2?
+
+&lt;i class="em em-pushpin"&gt;&lt;/i&gt; The following release, v2.9.3, should bring the much requested feature of **Profiles**!  
+Don't want to wait until then? Try it out now by upgrading to v2.9.2 and then &lt;a href="https://github.com/phw198/OutlookGoogleCalendarSync/issues/1307" target="_blank"&gt;applying the latest Profiles build&lt;/a&gt;.  
 
 &lt;i class="em em-high_brightness"&gt;&lt;/i&gt; **Enhancements**  
 
-- More reliable method to open browser
-- Option to show and sync with hidden Google calendars
-- Update of third-party DLL files
+- Don't steal focus for messageboxes, flash icon instead
+- Improved UX for category/colour map tests
+- Proactively offer hiding of splash screen following donation
 
 &lt;i class="em em-beetle"&gt;&lt;/i&gt; **Bugfix**  
 
-- Don't alert for alpha releases if user not opted in
-- Correctly sync Google "this and following events" recurring event changes
-- Fix end time of all day recurring items in non-GMT timezone
+- Fix missing Google default notification in Outlook appointment
+- Fix "the given key was not in the dictionary"
     </releaseNotes>
     <copyright>Copyright 2021</copyright>
     <tags>Outlook Google Calendar Sync 2-way Two-way Bidirection</tags>

diff --git a/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookFactory.cs b/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookFactory.cs
@@ -50,7 +50,8 @@ public enum OutlookVersionNames : Int16 {
             Standard2019Volume = 31,
             Standard2021Volume = 32,
             ProPlus2019Volume = 33,
-            ProPlus2021Volume = 34
+            ProPlus2021Volume = 34,
+            ProPlus2021Retail = 35
         }
 
         private const Boolean testing2003 = false;

diff --git a/src/OutlookGoogleCalendarSync/Properties/AssemblyInfo.cs b/src/OutlookGoogleCalendarSync/Properties/AssemblyInfo.cs
@@ -28,6 +28,6 @@
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
 [assembly: AssemblyVersion("2.9.*")]
-[assembly: AssemblyFileVersion("2.9.1.0")]
+[assembly: AssemblyFileVersion("2.9.2.0")]
 
 [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")]
diff --git a/src/OutlookGoogleCalendarSync/Updater.cs b/src/OutlookGoogleCalendarSync/Updater.cs
@@ -137,9 +137,15 @@ private async Task<Boolean> githubCheck() {
                         } else {
                             try {
                                 //"https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.8.6-alpha"
-                                String nupkgUrl = "https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v" + update.Version + "/" + update.Filename;
-                                log.Debug("Downloading " + nupkgUrl);
-                                new Extensions.OgcsWebClient().DownloadFile(nupkgUrl, localFile);
+                                if (string.IsNullOrEmpty(nonGitHubReleaseUri)) {
+                                    String nupkgUrl = "https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v" + update.Version + "/" + update.Filename;
+                                    log.Debug("Downloading " + nupkgUrl);
+                                    new Extensions.OgcsWebClient().DownloadFile(nupkgUrl, localFile); 
+                                } else {
+                                    String nupkgUrl = nonGitHubReleaseUri + "\\" + update.Filename;
+                                    log.Debug("Downloading " + nupkgUrl);
+                                    new System.Net.WebClient().DownloadFile(nupkgUrl, localFile);
+                                }
                                 log.Debug("Download complete.");
                             } catch (System.Exception ex) {
                                 OGCSexception.Analyse("Failed downloading release file " + update.Filename + " for " + update.Version, ex);