v2.10.1

README.md

@@ -19,8 +19,8 @@ If you find a bug, [help squash it](https://github.com/phw198/OutlookGoogleCalen
 :gear: [See the wiki](https://github.com/phw198/OutlookGoogleCalendarSync/wiki) for install, configuration guides and more.
 ### Latest Beta Release: [![Latest Release](https://img.shields.io/github/release/phw198/OutlookGoogleCalendarSync.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/latest) [![Latest Release downloads](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.0-beta/total.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/latest)
 
-:floppy_disk: [Installer](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.0-beta/Setup.exe)  
-      [![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.0-beta/Setup.exe.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.0-beta/Setup.exe)
+:floppy_disk: [Installer](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.0-beta/OGCS_Setup.exe)  
+      [![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.0-beta/OGCS_Setup.exe.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.0-beta/OGCS_Setup.exe)
 
 :package: [Portable ZIP](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.0-beta/Portable_OGCS_v2.10.0.zip)  
       [![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.0-beta/Portable_OGCS_v2.10.0.zip.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.0-beta/Portable_OGCS_v2.10.0.zip)
@@ -29,6 +29,18 @@ If you find a bug, [help squash it](https://github.com/phw198/OutlookGoogleCalen
       ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.0-beta/OutlookGoogleCalendarSync-2.10.0-beta-full.nupkg.svg)  
       ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.0-beta/OutlookGoogleCalendarSync-2.10.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.10.1-alpha) [![Latest Release downloads](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.1-alpha/total.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/v2.10.1-alpha)
+
+:floppy_disk: [Installer](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.1-alpha/OGCS_Setup.exe)  
+      [![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.1-alpha/OGCS_Setup.exe.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.1-alpha/OGCS_Setup.exe)
+
+:package: [Portable ZIP](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.1-alpha/Portable_OGCS_v2.10.1.zip)  
+      [![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.1-alpha/Portable_OGCS_v2.10.1.zip.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.1-alpha/Portable_OGCS_v2.10.1.zip)
+
+:information_source: Upgrades to this release  
+      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.1-alpha/OutlookGoogleCalendarSync-2.10.1-alpha-full.nupkg.svg)  
+      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.1-alpha/OutlookGoogleCalendarSync-2.10.1-alpha-delta.nupkg.svg)
+
 ## Functionality
 - Supports all versions of Outlook from 2003 to 2019/Microsoft365 64-bit!
 - Installable and portable options - even runs from a USB thumbdrive
@@ -37,7 +49,7 @@ If you find a bug, [help squash it](https://github.com/phw198/OutlookGoogleCalen
    - Outlook :arrow_left: Google
    - Outlook :left_right_arrow: Google (two-way/bidirectional sync)
 - Supports configuring multiple calendars for sync
-- Includes the following event attributes:
+- Includes the following calendar item attributes:
    - Subject
    - Description
    - Location
@@ -46,6 +58,10 @@ If you find a bug, [help squash it](https://github.com/phw198/OutlookGoogleCalen
    - Availability (free/busy)
    - Privacy (public/private)
    - Colour / category (custom mappings supported)
+- Exclude calendar items by:
+   - Availability (free/tentative)
+   - Privacy (private)
+   - Category
 - Differential comparison updates only attributes that have changed
 - Customisable date range to synchronise, past and future
 - Frequency of automatic syncs, including push-sync from Outlook

docs/Release Notes.md

@@ -1,6 +1,26 @@
 | Release Notes |
 |:---|
 
+# v2.10.1.0 - Alpha
+
+**Enhancements**
+- New options to exclude:
+    - All-day items [[#104](https://github.com/phw198/OutlookGoogleCalendarSync/issues/104)]
+    - Items by availability: free, tentative [[#825](https://github.com/phw198/OutlookGoogleCalendarSync/issues/825)]
+    - Items by privacy: private [[#415](https://github.com/phw198/OutlookGoogleCalendarSync/issues/415)]
+- New option to choose deletion of previously synced Google items, which are now excluded by category [[#1682](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1682)]
+    - NB: The default behaviour is to delete
+- Ability to export/import settings [[#1561](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1561)]
+- Log occurrence deletions to console
+- OGCS logo updated with modernised "G"
+    - Animated logo in notification tray during sync [[#1602](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1602)]
+- Update of third-party DLL files
+
+**Bugfix**
+- Incorrect detection of deleted occurrences within a series [[#1653](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1653)]
+- Handle Outlook recurring series having different start/end time zones, which Google does not allow
+- Better API quota management
+
 # v2.10.0.0 - Beta
 
 **Enhancements** rolled in from Alpha releases

docs/latest_zip_release.md

@@ -1,3 +1,3 @@
 # Latest ZIP Release
-**Alpha**: [v2.9.7.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.9.7-alpha)  
+**Alpha**: [v2.10.1.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.10.1-alpha)  
 **Beta**: [v2.10.0.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/latest)

nuget-build.bat

@@ -1,4 +1,5 @@
-set RELEASE=2.10.0-beta
+set RELEASE=2.10.1-alpha
+set RELEASEDIR=Release
 
 REM Check for new NodaTime DB @ http://nodatime.org/tzdb/latest.txt
 
@@ -9,11 +10,11 @@ del Releases\OutlookGoogleCalendarSync-%RELEASE%-delta.nupkg
 cd ..
 
 REM Sign the stand-alone OGCS 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\OutlookGoogleCalendarSync\bin\Release\OutlookGoogleCalendarSync.exe
+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\OutlookGoogleCalendarSync\bin\%RELEASEDIR%\OutlookGoogleCalendarSync.exe
 
 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.10.0-beta.nupkg --no-msi --loadingGif=..\docs\images\ogcs128x128-animated.gif
+REM PM> packages\squirrel.windows.1.9.0\tools\Squirrel --releasify OutlookGoogleCalendarSync.2.10.1-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
@@ -23,16 +24,16 @@ PAUSE
 del src\Releases\OGCS_Setup.exe
 rename src\Releases\Setup.exe OGCS_Setup.exe
 
-cd src\OutlookGoogleCalendarSync\bin\Release
-del Portable_OGCS_v2.10.0.zip
-"c:\Program Files\7-Zip\7z.exe" u Portable_OGCS_v2.9.7.zip -u- -up0q0r2x2y2z1w2!Portable_OGCS_v2.10.0.zip *.dll *.ps1 ErrorReportingTemplate.json logger.xml tzdb.nzd OutlookGoogleCalendarSync.exe OutlookGoogleCalendarSync.exe.config OutlookGoogleCalendarSync.pdb Console\* 
+cd src\OutlookGoogleCalendarSync\bin\%RELEASEDIR%
+del Portable_OGCS_v2.10.1.zip
+"c:\Program Files\7-Zip\7z.exe" u Portable_OGCS_v2.10.0.zip -u- -up0q0r2x2y2z1w2!Portable_OGCS_v2.10.1.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.7.zip Microsoft.Office.Interop.Outlook.DLL
-"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.9.7.zip stdole.dll
-"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.9.7.zip "Windows Defender SmartScreen Unblock.ps1"
+"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.10.0.zip Microsoft.Office.Interop.Outlook.DLL
+"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.10.0.zip stdole.dll
+"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.10.0.zip "Windows Defender SmartScreen Unblock.ps1"
 
-"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.10.0.zip Microsoft.Office.Interop.Outlook.DLL
-"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.10.0.zip stdole.dll
-"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.10.0.zip "Windows Defender SmartScreen Unblock.ps1"
+"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.10.1.zip Microsoft.Office.Interop.Outlook.DLL
+"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.10.1.zip stdole.dll
+"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.10.1.zip "Windows Defender SmartScreen Unblock.ps1"
 
 cd ..\..\..\..

src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>OutlookGoogleCalendarSync</id>
-    <version>2.10.0-beta</version>
+    <version>2.10.1-alpha</version>
     <title>Outlook Google Calendar Sync</title>
     <authors>Paul Woolcock</authors>
     <owners>phw198</owners>
@@ -12,30 +12,28 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Sync Outlook and Google calendars.</description>
     <releaseNotes>
-# What's New In v2.10.0?
+# What's New In v2.10.1?
 
-&lt;i class="em em-high_brightness"&gt;&lt;/i&gt; **Enhancements** rolled in from Alpha releases  
+&lt;i class="em em-high_brightness"&gt;&lt;/i&gt; **Enhancements**  
 
-- The arrival of _Profiles_ brings multi-calendar sync! :tada: 
-- Option to show and sync with hidden Google calendars
-- Option to set synced items as 'public'
-- Recurring series improvements
-    - When moving occurrence to date of another previously existing occurrence
-    - When moving occurrence multiple times
-- When deletions are disabled, list items intended for deletion
-- Better UI for colour map configuration
-- Improved UX for category/colour map tests
-- Categories now properly populating for Alternate Mailbox
-- Option to set OGCS to startup for all Windows users, not just current
-- Don't steal focus for messageboxes, flash icon instead
-- Do not delete inaccessible Outlook items from Google
-- Only exclude unresponded invites during creation
-    - Don't delete if rescheduled and not responded to
-- 2-way: Don't delete from Google items that were filtered out from Outlook
+- New options to exclude:
+    - All-day items [[#104](https://github.com/phw198/OutlookGoogleCalendarSync/issues/104)]
+    - Items by availability: free, tentative [[#825](https://github.com/phw198/OutlookGoogleCalendarSync/issues/825)]
+    - Items by privacy: private [[#415](https://github.com/phw198/OutlookGoogleCalendarSync/issues/415)]
+- New option to choose deletion of previously synced Google items, which are now excluded by category [[#1682](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1682)]
+    - NB: The default behaviour is to delete
+- Ability to export/import settings [[#1561](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1561)]
+- Log occurrence deletions to console
+- OGCS logo updated with modernised "G"
+    - Animated logo in notification tray during sync [[#1602](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1602)]
+- Update of third-party DLL files
 
 &lt;i class="em em-beetle"&gt;&lt;/i&gt; **Bugfix**  
 
-- Numerous bug fixes included from v2.9.1 through v2.9.7
+- Incorrect detection of deleted occurrences within a series [[#1653](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1653)]
+- Handle Outlook recurring series having different start/end time zones, which Google does not allow
+- Better API quota management
+
     </releaseNotes>
     <copyright>Copyright 2023</copyright>
     <tags>Outlook Google Calendar Sync 2-way Two-way Bidirection</tags>

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.10.*")]
-[assembly: AssemblyFileVersion("2.10.0.5")]
+[assembly: AssemblyFileVersion("2.10.1.0")]
 
 [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")]

src/OutlookGoogleCalendarSync/Updater.cs

@@ -183,7 +183,7 @@ private async Task<Boolean> githubCheck() {
                     squirrelGaEv.AddParameter(GA4.Squirrel.target_version, releaseVersion);
                     squirrelGaEv.AddParameter(GA4.Squirrel.target_type, releaseType);
 
-                    if (dr == DialogResult.No) {
+                    if (dr == DialogResult.No || dr == DialogResult.Cancel) {
                         log.Info("User chose not to upgrade right now.");
                         Telemetry.Send(Analytics.Category.squirrel, Analytics.Action.upgrade, squirrelAnalyticsLabel + ";later");
                         squirrelGaEv.AddParameter(GA4.Squirrel.action_taken, "Deferred");