v2.10.2

phw198 · Oct 29, 2023 · f503ccd · f503ccd
1 parent c75ce6c
commit f503ccd
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 52 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.10.0-beta/OutlookGoogleCalendarSync-2.10.0-beta-full.nupkg.svg)  
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](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)
+### Latest Alpha Release: [![Latest Release](https://img.shields.io/github/release/phw198/OutlookGoogleCalendarSync/all.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.10.2-alpha) [![Latest Release downloads](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.2-alpha/total.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/v2.10.2-alpha)
 
-:floppy_disk: [Installer](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.1-alpha/OGCS_Setup.exe)  
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![](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)
+:floppy_disk: [Installer](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.2-alpha/OGCS_Setup.exe)  
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.2-alpha/OGCS_Setup.exe.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.2-alpha/OGCS_Setup.exe)
 
-:package: [Portable ZIP](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.1-alpha/Portable_OGCS_v2.10.1.zip)  
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![](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)
+:package: [Portable ZIP](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.2-alpha/Portable_OGCS_v2.10.2.zip)  
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.2-alpha/Portable_OGCS_v2.10.2.zip.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.10.2-alpha/Portable_OGCS_v2.10.2.zip)
 
 :information_source: Upgrades to this release  
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.1-alpha/OutlookGoogleCalendarSync-2.10.1-alpha-full.nupkg.svg)  
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.1-alpha/OutlookGoogleCalendarSync-2.10.1-alpha-delta.nupkg.svg)
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.2-alpha/OutlookGoogleCalendarSync-2.10.2-alpha-full.nupkg.svg)  
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.2-alpha/OutlookGoogleCalendarSync-2.10.2-alpha-delta.nupkg.svg)
 
 ## Functionality
 - Supports all versions of Outlook from 2003 to 2019/Microsoft365 64-bit!
@@ -61,7 +61,9 @@ If you find a bug, [help squash it](https://github.com/phw198/OutlookGoogleCalen
 - Exclude calendar items by:
    - Availability (free/tentative)
    - Privacy (private)
-   - Category
+   - Title/subject
+   - Outlook category
+   - Google colour
 - 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

diff --git a/docs/Release Notes.md b/docs/Release Notes.md
@@ -1,6 +1,24 @@
 | Release Notes |
 |:---|
 
+# v2.10.2.0 - Alpha
+
+**Enhancements**
+- New option to:
+    - Exclude Google items based on colour [[#1553](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1553)]
+    - Exclude items based on title/subject [[#1688](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1688)]
+    - Obfuscate any of subject, location, description [[#500](https://github.com/phw198/OutlookGoogleCalendarSync/issues/500)]
+- When deletion prompt is declined, sync item instead [[#1691](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1691)]
+- If Google "Busy" status, persist Outlook statuses of: Out of office, Tentative, Working elsewhere [[#1259](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1259)]
+- Clearer user interface for sync interval Fair Usage Policy [[#1699](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1699)]
+
+**Bugfix**
+- Redirect to the wiki when COM error encountered [[#1710](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1710)]
+- Fix failing check for new ZIP releases [[#1711](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1711)]
+- Detect and remove custom application recurrence rules [[#1712](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1712)]
+- Fix incorrect detection of multiple OGCS instances with same config [[#1717](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1717)]
+- Previously synced exclusion no longer deleted when reinstated [[#1686](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1686)]
+
 # v2.10.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.10.1.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.10.1-alpha)  
+**Alpha**: [v2.10.2.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.10.2-alpha)  
 **Beta**: [v2.10.0.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/latest)
diff --git a/nuget-build.bat b/nuget-build.bat
@@ -1,4 +1,4 @@
-set RELEASE=2.10.1-alpha
+set RELEASE=2.10.2-alpha
 set RELEASEDIR=Release
 
 REM Check for new NodaTime DB @ http://nodatime.org/tzdb/latest.txt
@@ -14,7 +14,7 @@ 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.10.1-alpha.nupkg --no-msi --loadingGif=..\docs\images\ogcs128x128-animated.gif
+REM PM> packages\squirrel.windows.1.9.0\tools\Squirrel --releasify OutlookGoogleCalendarSync.2.10.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
@@ -25,15 +25,15 @@ del src\Releases\OGCS_Setup.exe
 rename src\Releases\Setup.exe OGCS_Setup.exe
 
 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\* 
+del Portable_OGCS_v2.10.2.zip
+"c:\Program Files\7-Zip\7z.exe" u Portable_OGCS_v2.10.1.zip -u- -up0q0r2x2y2z1w2!Portable_OGCS_v2.10.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.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" e -y Portable_OGCS_v2.10.1.zip Microsoft.Office.Interop.Outlook.DLL
+"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.10.1.zip stdole.dll
+"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.10.1.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"
+"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.10.2.zip Microsoft.Office.Interop.Outlook.DLL
+"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.10.2.zip stdole.dll
+"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.10.2.zip "Windows Defender SmartScreen Unblock.ps1"
 
 cd ..\..\..\..
diff --git a/src/OutlookGoogleCalendarSync/Forms/UpdateInfo.Designer.cs b/src/OutlookGoogleCalendarSync/Forms/UpdateInfo.Designer.cs
diff --git a/src/OutlookGoogleCalendarSync/Forms/UpdateInfo.cs b/src/OutlookGoogleCalendarSync/Forms/UpdateInfo.cs
@@ -70,6 +70,16 @@ private void WebBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompl
             } catch { }
         }
 
+        /// <summary>
+        /// Intercept clicked links and open in default browser
+        /// </summary>
+        private void webBrowser_Navigating(object sender, WebBrowserNavigatingEventArgs e) {
+            if (!(e.Url.ToString().Equals("about:blank", StringComparison.InvariantCultureIgnoreCase))) {
+                Helper.OpenBrowser(e.Url.ToString());
+                e.Cancel = true;
+            }
+        }
+
         private void btSkipVersion_Click(object sender, EventArgs e) {
             log.Info("User has opted to skip upgrading to this version.");
             Settings.Instance.SkipVersion = version;

diff --git a/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec b/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>OutlookGoogleCalendarSync</id>
-    <version>2.10.1-alpha</version>
+    <version>2.10.2-alpha</version>
     <title>Outlook Google Calendar Sync</title>
     <authors>Paul Woolcock</authors>
     <owners>phw198</owners>
@@ -12,27 +12,25 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Sync Outlook and Google calendars.</description>
     <releaseNotes>
-# What's New In v2.10.1?
+# What's New In v2.10.2?
 
 &lt;i class="em em-high_brightness"&gt;&lt;/i&gt; **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
+- New option to:
+    - Exclude Google items based on colour [[#1553](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1553)]
+    - Exclude items based on title/subject [[#1688](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1688)]
+    - Obfuscate any of subject, location, description [[#500](https://github.com/phw198/OutlookGoogleCalendarSync/issues/500)]
+- When deletion prompt is declined, sync item instead [[#1691](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1691)]
+- If Google "Busy" status, persist Outlook statuses of: Out of office, Tentative, Working elsewhere [[#1259](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1259)]
+- Clearer user interface for sync interval Fair Usage Policy [[#1699](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1699)]
 
 &lt;i class="em em-beetle"&gt;&lt;/i&gt; **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
+- Redirect to the wiki when COM error encountered [[#1710](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1710)]
+- Fix failing check for new ZIP releases [[#1711](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1711)]
+- Detect and remove custom application recurrence rules [[#1712](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1712)]
+- Fix incorrect detection of multiple OGCS instances with same config [[#1717](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1717)]
+- Previously synced exclusion no longer deleted when reinstated [[#1686](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1686)]
 
     </releaseNotes>
     <copyright>Copyright 2023</copyright>

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