From f503ccde632b2afe45137277c080378112b2eab6 Mon Sep 17 00:00:00 2001 From: Paul Woolcock <11843015+phw198@users.noreply.github.com> Date: Sun, 29 Oct 2023 15:59:10 +0000 Subject: [PATCH] v2.10.2 --- README.md | 18 +++++----- docs/Release Notes.md | 18 ++++++++++ docs/latest_zip_release.md | 2 +- nuget-build.bat | 20 +++++------ .../Forms/UpdateInfo.Designer.cs | 33 ++++++++++--------- .../Forms/UpdateInfo.cs | 10 ++++++ .../OutlookGoogleCalendarSync.nuspec | 30 ++++++++--------- .../Properties/AssemblyInfo.cs | 2 +- 8 files changed, 81 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index f13bb80c..8ed7c550 100644 --- a/README.md +++ b/README.md @@ -29,17 +29,17 @@ 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) +### 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) -      [![](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) +      [![](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) -      [![](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) +      [![](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 -      ![](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) +      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.10.2-alpha/OutlookGoogleCalendarSync-2.10.2-alpha-full.nupkg.svg) +      ![](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 index b48acf42..4e24a9e6 100644 --- 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 index 7bb46d65..a3e14bc6 100644 --- 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 index 3337381b..485f2682 100644 --- 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 index d9014b72..e60143da 100644 --- a/src/OutlookGoogleCalendarSync/Forms/UpdateInfo.Designer.cs +++ b/src/OutlookGoogleCalendarSync/Forms/UpdateInfo.Designer.cs @@ -27,12 +27,12 @@ private void InitializeComponent() { this.webBrowser = new System.Windows.Forms.WebBrowser(); this.btUpgrade = new System.Windows.Forms.Button(); this.wbPanel = new System.Windows.Forms.Panel(); + this.llViewOnGithub = new System.Windows.Forms.LinkLabel(); this.btLater = new System.Windows.Forms.Button(); this.lSummary = new System.Windows.Forms.Label(); this.lTitle = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.btSkipVersion = new System.Windows.Forms.Button(); - this.llViewOnGithub = new System.Windows.Forms.LinkLabel(); this.wbPanel.SuspendLayout(); this.SuspendLayout(); // @@ -46,6 +46,7 @@ private void InitializeComponent() { this.webBrowser.Size = new System.Drawing.Size(465, 166); this.webBrowser.TabIndex = 0; this.webBrowser.WebBrowserShortcutsEnabled = false; + this.webBrowser.Navigating += new System.Windows.Forms.WebBrowserNavigatingEventHandler(this.webBrowser_Navigating); // // btUpgrade // @@ -72,6 +73,21 @@ private void InitializeComponent() { this.wbPanel.Size = new System.Drawing.Size(467, 168); this.wbPanel.TabIndex = 2; // + // llViewOnGithub + // + this.llViewOnGithub.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.llViewOnGithub.AutoSize = true; + this.llViewOnGithub.BackColor = System.Drawing.Color.White; + this.llViewOnGithub.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.llViewOnGithub.Location = new System.Drawing.Point(121, 38); + this.llViewOnGithub.Name = "llViewOnGithub"; + this.llViewOnGithub.Size = new System.Drawing.Size(201, 20); + this.llViewOnGithub.TabIndex = 9; + this.llViewOnGithub.TabStop = true; + this.llViewOnGithub.Text = "View Release Notes Online"; + this.llViewOnGithub.TextAlign = System.Drawing.ContentAlignment.TopCenter; + this.llViewOnGithub.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.llViewOnGithub_LinkClicked); + // // btLater // this.btLater.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -124,21 +140,6 @@ private void InitializeComponent() { this.btSkipVersion.UseVisualStyleBackColor = true; this.btSkipVersion.Click += new System.EventHandler(this.btSkipVersion_Click); // - // llViewOnGithub - // - this.llViewOnGithub.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.llViewOnGithub.AutoSize = true; - this.llViewOnGithub.BackColor = System.Drawing.Color.White; - this.llViewOnGithub.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.llViewOnGithub.Location = new System.Drawing.Point(121, 38); - this.llViewOnGithub.Name = "llViewOnGithub"; - this.llViewOnGithub.Size = new System.Drawing.Size(201, 20); - this.llViewOnGithub.TabIndex = 9; - this.llViewOnGithub.TabStop = true; - this.llViewOnGithub.Text = "View Release Notes Online"; - this.llViewOnGithub.TextAlign = System.Drawing.ContentAlignment.TopCenter; - this.llViewOnGithub.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.llViewOnGithub_LinkClicked); - // // UpdateInfo // this.AcceptButton = this.btUpgrade; diff --git a/src/OutlookGoogleCalendarSync/Forms/UpdateInfo.cs b/src/OutlookGoogleCalendarSync/Forms/UpdateInfo.cs index c2976457..7a55017e 100644 --- a/src/OutlookGoogleCalendarSync/Forms/UpdateInfo.cs +++ b/src/OutlookGoogleCalendarSync/Forms/UpdateInfo.cs @@ -70,6 +70,16 @@ private void WebBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompl } catch { } } + /// + /// Intercept clicked links and open in default browser + /// + 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 index 5958ec37..1cd8fd50 100644 --- a/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec +++ b/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec @@ -2,7 +2,7 @@ OutlookGoogleCalendarSync - 2.10.1-alpha + 2.10.2-alpha Outlook Google Calendar Sync Paul Woolcock phw198 @@ -12,27 +12,25 @@ false Sync Outlook and Google calendars. -# What's New In v2.10.1? +# What's New In v2.10.2? <i class="em em-high_brightness"></i> **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)] <i class="em em-beetle"></i> **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)] Copyright 2023 diff --git a/src/OutlookGoogleCalendarSync/Properties/AssemblyInfo.cs b/src/OutlookGoogleCalendarSync/Properties/AssemblyInfo.cs index a4710490..730a367b 100644 --- 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")] \ No newline at end of file