From 5bf13d722153608b7820548630ea3ec533c5d85e Mon Sep 17 00:00:00 2001 From: Paul Woolcock <11843015+phw198@users.noreply.github.com> Date: Sun, 14 Nov 2021 16:29:39 +0000 Subject: [PATCH] v2.9.2 --- README.md | 14 ++++++------- docs/Release Notes.md | 11 ++++++++++ docs/latest_zip_release.md | 2 +- nuget-build.bat | 21 +++++++++++-------- .../OutlookGoogleCalendarSync.nuspec | 18 +++++++++------- .../OutlookOgcs/OutlookFactory.cs | 3 ++- .../Properties/AssemblyInfo.cs | 2 +- src/OutlookGoogleCalendarSync/Updater.cs | 12 ++++++++--- 8 files changed, 53 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index b2c7235b..66d4324f 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.9.0-beta/OutlookGoogleCalendarSync-2.9.0-beta-full.nupkg.svg)      ![](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) -      [![](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) +      [![](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) -      [![](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) +      [![](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 -      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.1-alpha/OutlookGoogleCalendarSync-2.9.1-alpha-full.nupkg.svg) -      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.1-alpha/OutlookGoogleCalendarSync-2.9.1-alpha-delta.nupkg.svg) +      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.9.2-alpha/OutlookGoogleCalendarSync-2.9.2-alpha-full.nupkg.svg) +      ![](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 index 8c56bc77..b47f9187 100644 --- 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 index 3e5d2341..baa443b7 100644 --- 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 index b9f4afdc..7fb6e3cd 100644 --- 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,7 +13,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.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 @@ -19,14 +21,15 @@ REM src\packages\squirrel.windows.1.9.0\tools\signtool.exe sign /n "Open Source 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 index 47b90386..23eeeb45 100644 --- a/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec +++ b/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec @@ -2,7 +2,7 @@ OutlookGoogleCalendarSync - 2.9.1-alpha + 2.9.2-alpha Outlook Google Calendar Sync Paul Woolcock phw198 @@ -12,19 +12,21 @@ false Sync Outlook and Google calendars. -# What's New In v2.9.1? +# What's New In v2.9.2? + +<i class="em em-pushpin"></i> 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 <a href="https://github.com/phw198/OutlookGoogleCalendarSync/issues/1307" target="_blank">applying the latest Profiles build</a>. <i class="em em-high_brightness"></i> **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 <i class="em em-beetle"></i> **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" Copyright 2021 Outlook Google Calendar Sync 2-way Two-way Bidirection diff --git a/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookFactory.cs b/src/OutlookGoogleCalendarSync/OutlookOgcs/OutlookFactory.cs index a58c7400..71136f69 100644 --- 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 index 9518b2bc..f9a92265 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.9.*")] -[assembly: AssemblyFileVersion("2.9.1.0")] +[assembly: AssemblyFileVersion("2.9.2.0")] [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")] \ No newline at end of file diff --git a/src/OutlookGoogleCalendarSync/Updater.cs b/src/OutlookGoogleCalendarSync/Updater.cs index 782eb333..a8fe97ca 100644 --- a/src/OutlookGoogleCalendarSync/Updater.cs +++ b/src/OutlookGoogleCalendarSync/Updater.cs @@ -137,9 +137,15 @@ private async Task 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);