From 613032374c4518db1761f687c8b9a34c078a1ae1 Mon Sep 17 00:00:00 2001 From: Paul Woolcock <11843015+phw198@users.noreply.github.com> Date: Tue, 14 Jan 2025 00:24:48 +0000 Subject: [PATCH] v2.11.2 --- README.md | 16 ++++++------ docs/Release Notes.md | 17 ++++++++++++ docs/latest_zip_release.md | 2 +- nuget-build.bat | 21 ++++++++------- .../OutlookGoogleCalendarSync.nuspec | 26 ++++++++----------- .../Properties/AssemblyInfo.cs | 4 +-- src/OutlookGoogleCalendarSync/zipHotfix.ps1 | 3 +++ 7 files changed, 53 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index bb19aef7..21c68a26 100644 --- a/README.md +++ b/README.md @@ -29,22 +29,22 @@ If you find a bug, [help squash it](https://github.com/phw198/OutlookGoogleCalen      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.0-beta/OutlookGoogleCalendarSync-2.11.0-beta-full.nupkg.svg)      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.0-beta/OutlookGoogleCalendarSync-2.11.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.11.1-alpha) [![Latest Release downloads](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.1-alpha/total.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/v2.11.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.11.2-alpha) [![Latest Release downloads](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.2-alpha/total.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/v2.11.2-alpha) -:floppy_disk: [Installer](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.11.1-alpha/OGCS_Setup.exe) -      [![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.1-alpha/OGCS_Setup.exe.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.11.1-alpha/OGCS_Setup.exe) +:floppy_disk: [Installer](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.11.2-alpha/OGCS_Setup.exe) +      [![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.2-alpha/OGCS_Setup.exe.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.11.2-alpha/OGCS_Setup.exe) -:package: [Portable ZIP](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.11.1-alpha/Portable_OGCS_v2.11.1.zip) -      [![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.1-alpha/Portable_OGCS_v2.11.1.zip.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.11.1-alpha/Portable_OGCS_v2.11.1.zip) +:package: [Portable ZIP](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.11.2-alpha/Portable_OGCS_v2.11.2.zip) +      [![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.2-alpha/Portable_OGCS_v2.11.2.zip.svg)](https://github.com/phw198/OutlookGoogleCalendarSync/releases/download/v2.11.2-alpha/Portable_OGCS_v2.11.2.zip) :information_source: Upgrades to this release -      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.1-alpha/OutlookGoogleCalendarSync-2.11.1-alpha-full.nupkg.svg) -      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.1-alpha/OutlookGoogleCalendarSync-2.11.1-alpha-delta.nupkg.svg) +      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.2-alpha/OutlookGoogleCalendarSync-2.11.2-alpha-full.nupkg.svg) +      ![](https://img.shields.io/github/downloads/phw198/outlookgooglecalendarsync/v2.11.2-alpha/OutlookGoogleCalendarSync-2.11.2-alpha-delta.nupkg.svg) ## Functionality - Supports all versions of Outlook from 2003 to 2021 64-bit! - Including Microsoft365 releases from the [General Availability](https://learn.microsoft.com/en-us/windows/deployment/update/get-started-updates-channels-tools#general-availability-channel) channel - - For "New Outlook", [check the latest developments](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1881) + - For "New Outlook", [check the latest developments](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1888) - Installable and portable options - even runs from a USB thumbdrive - Synchronises items in any calendar folder, including those shared with you, from - Outlook :arrow_right: Google diff --git a/docs/Release Notes.md b/docs/Release Notes.md index c158dd1a..860469ce 100644 --- a/docs/Release Notes.md +++ b/docs/Release Notes.md @@ -1,6 +1,23 @@ | Release Notes | |:---| +# v2.11.2.0 - Alpha + +**Enhancements** +- Sync Engine + - Improved monthly recurrence on day >28th + - Optimised retrieval of Google recurring series and its instances [[#2034](https://github.com/phw198/OutlookGoogleCalendarSync/issues/2034)] + - New emoji for recurring series exception + +**Bugfix** +- Application + - Update of third-party DLL files + - Now requires .NET Framework 4.6.2 + - Include all-day series master ending on sync window start date + - Clearer notification message for Outlook security [[#2040](https://github.com/phw198/OutlookGoogleCalendarSync/issues/2040)] +- Sync Engine + - Retrieve Google Event in UTC time zone [[#2026](https://github.com/phw198/OutlookGoogleCalendarSync/issues/2026)] + # v2.11.1.0 - Alpha **Enhancements** diff --git a/docs/latest_zip_release.md b/docs/latest_zip_release.md index a2724996..91770762 100644 --- a/docs/latest_zip_release.md +++ b/docs/latest_zip_release.md @@ -1,3 +1,3 @@ # Latest ZIP Release -**Alpha**: [v2.11.1.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.11.1-alpha) +**Alpha**: [v2.11.2.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/tag/v2.11.2-alpha) **Beta**: [v2.11.0.0](https://github.com/phw198/OutlookGoogleCalendarSync/releases/latest) diff --git a/nuget-build.bat b/nuget-build.bat index 7082042b..5619521f 100644 --- a/nuget-build.bat +++ b/nuget-build.bat @@ -1,4 +1,4 @@ -set RELEASE=2.11.1-alpha +set RELEASE=2.11.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 /a /n "Open Sour 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.11.1-alpha.nupkg --no-msi --loadingGif=..\docs\images\ogcs128x128-animated.gif +REM PM> packages\squirrel.windows.1.9.0\tools\Squirrel --releasify OutlookGoogleCalendarSync.2.11.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 /a /n "Open Source Developer, Paul Woolcock" /tr http://time.certum.pl/ /td sha256 /fd sha256 /v src\Releases\Setup.exe @@ -25,15 +25,16 @@ del src\Releases\OGCS_Setup.exe rename src\Releases\Setup.exe OGCS_Setup.exe cd src\OutlookGoogleCalendarSync\bin\%RELEASEDIR% -del Portable_OGCS_v2.11.1.zip -"c:\Program Files\7-Zip\7z.exe" u Portable_OGCS_v2.11.0.zip -u- -up0q0r2x2y2z1w2!Portable_OGCS_v2.11.1.zip *.dll *.ps1 ErrorReportingTemplate.json logger.xml tzdb.nzd OutlookGoogleCalendarSync.exe OutlookGoogleCalendarSync.exe.config OutlookGoogleCalendarSync.pdb Console\* +del Portable_OGCS_v2.11.2.zip +REM https://documentation.help/7-Zip/update1.htm +"c:\Program Files\7-Zip\7z.exe" u Portable_OGCS_v2.11.1.zip -u- -up0q0r2x2y2z1w2!Portable_OGCS_v2.11.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.11.0.zip Microsoft.Office.Interop.Outlook.DLL -"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.11.0.zip stdole.dll -"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.11.0.zip "Windows Defender SmartScreen Unblock.ps1" +"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.11.1.zip Microsoft.Office.Interop.Outlook.DLL +"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.11.1.zip stdole.dll +"c:\Program Files\7-Zip\7z.exe" e -y Portable_OGCS_v2.11.1.zip "Windows Defender SmartScreen Unblock.ps1" -"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.11.1.zip Microsoft.Office.Interop.Outlook.DLL -"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.11.1.zip stdole.dll -"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.11.1.zip "Windows Defender SmartScreen Unblock.ps1" +"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.11.2.zip Microsoft.Office.Interop.Outlook.DLL +"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.11.2.zip stdole.dll +"c:\Program Files\7-Zip\7z.exe" a Portable_OGCS_v2.11.2.zip "Windows Defender SmartScreen Unblock.ps1" cd ..\..\..\.. diff --git a/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec b/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec index d26ed3aa..e2206868 100644 --- a/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec +++ b/src/OutlookGoogleCalendarSync/OutlookGoogleCalendarSync.nuspec @@ -2,7 +2,7 @@ OutlookGoogleCalendarSync - 2.11.1-alpha + 2.11.2-alpha Outlook Google Calendar Sync Paul Woolcock phw198 @@ -12,30 +12,26 @@ false Sync Outlook and Google calendars. -# What's New In v2.11.1? +# What's New In v2.11.2? <i class="em em-high_brightness"></i> **Enhancements** - Sync Engine - - Improved warning messages when colours/categories excluded [[#1989](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1989)] - - Improved two-way sync behaviour when deletion prompt declined [[#1989](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1989)] + - Improved monthly recurrence on day >28th + - Optimised retrieval of Google recurring series and its instances [[#2034](https://github.com/phw198/OutlookGoogleCalendarSync/issues/2034)] + - New emoji for recurring series exception <i class="em em-beetle"></i> **Bugfix** - Application - - Handle insufficient Google calendar permissions better [[#1937](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1937)] - - Properly disconnect from Google account [[#1937](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1937)] - - Ensure Console content is always visible [[#1958](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1958)] - - Remember choice to skip release upgrade [[#1951](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1951)] - - Default obfuscation to subject property; handle null in settings [[#1997](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1997)] - - Dedupe Google colour list - - Open default system browser for OGCS links + - Update of third-party DLL files + - Now requires .NET Framework 4.6.2 + - Include all-day series master ending on sync window start date + - Clearer notification message for Outlook security [[#2040](https://github.com/phw198/OutlookGoogleCalendarSync/issues/2040)] - Sync Engine - - Optimise exclusion of Outlook categories [[#1929](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1929)] - - Handle empty appointment bodies when obfuscating [[#1959](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1959)] - - Fixed premature deletion warnings in two-way sync [[#1999](https://github.com/phw198/OutlookGoogleCalendarSync/issues/1999)] + - Retrieve Google Event in UTC time zone [[#2026](https://github.com/phw198/OutlookGoogleCalendarSync/issues/2026)] - Copyright 2024 + Copyright 2025 Outlook Google Calendar Sync 2-way Two-way Bidirection diff --git a/src/OutlookGoogleCalendarSync/Properties/AssemblyInfo.cs b/src/OutlookGoogleCalendarSync/Properties/AssemblyInfo.cs index b4aef16a..f15440f0 100644 --- a/src/OutlookGoogleCalendarSync/Properties/AssemblyInfo.cs +++ b/src/OutlookGoogleCalendarSync/Properties/AssemblyInfo.cs @@ -13,7 +13,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Paul Woolcock")] [assembly: AssemblyProduct("Outlook Google Calendar Sync")] -[assembly: AssemblyCopyright("Copyright 2024")] +[assembly: AssemblyCopyright("Copyright 2025")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -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.11.*")] -[assembly: AssemblyFileVersion("2.11.1.0")] +[assembly: AssemblyFileVersion("2.11.2.0")] [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")] \ No newline at end of file diff --git a/src/OutlookGoogleCalendarSync/zipHotfix.ps1 b/src/OutlookGoogleCalendarSync/zipHotfix.ps1 index 83936ae9..2643d9cd 100644 --- a/src/OutlookGoogleCalendarSync/zipHotfix.ps1 +++ b/src/OutlookGoogleCalendarSync/zipHotfix.ps1 @@ -17,6 +17,9 @@ function getCRC($data) { } if ($BuildType -eq "Release") { + # Clean up third-party documentation and debug files + Get-ChildItem -Name -Include "*.xml", "*.pdb", "*.application", "*.exe.manifest" -Exclude "logger.xml", "OutlookGoogleCalendarSync.pdb" | Remove-Item; + $pinFile = "C:\temp\pin.txt" if (Test-Path $pinFile) { Write-Host (Get-Content $pinFile)