Fix conflicts and update Patch Version

Author: pragnagopa

build/common.props

@@ -5,7 +5,7 @@
     <LangVersion>7.2</LangVersion>
     <MajorVersion>3</MajorVersion>
     <MinorVersion>4</MinorVersion>
-    <PatchVersion>1</PatchVersion>
+    <PatchVersion>2</PatchVersion>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <Version Condition=" '$(BuildNumber)' != '' ">$(VersionPrefix)-$(BuildNumber)</Version>
     <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>

src/WebJobs.Script.WebHost/Management/FunctionsSyncManager.cs

@@ -161,28 +161,6 @@ public async Task<SyncTriggersResult> TrySyncTriggersAsync(bool isBackgroundSync
             return result;
         }
 
-        /// <summary>
-        /// SyncTriggers is performed whenever deployments or other changes are made to the application.
-        /// There are some operations we want to perform whenever this happens.
-        /// </summary>
-        private void PrepareSyncTriggers()
-        {
-            // We clear cache to ensure that secrets are reloaded. This is important because secrets are part
-            // of the StartupContext payload (see StartupContextProvider) and that payload comes from the
-            // SyncTriggers operation. So there's a chicken and egg situation here. Consider the following scenario:
-            //   - app is using blob storage for keys
-            //   - a SyncTriggers operation has happened previously and the StartupContext has key info
-            //   - app instances initialize keys from StartupContext (keys aren't loaded from storage)
-            //   - user updates the app to use a new storage account
-            //   - a SyncTriggers operation is performed
-            //   - the app initializes from StartupContext, and **previous old key info is loaded**
-            //   - the SyncTriggers operation uses this old key info, so trigger cache is never updated with new key info
-            //   - Portal/ARM APIs will continue to show old key info.
-            // By clearing cache, we ensure that this host instance reloads keys when they're requested, and the SyncTriggers
-            // operation will contain current keys.
-            _secretManagerProvider.Current.ClearCache();
-        }
-
         /// <summary>
         /// SyncTriggers is performed whenever deployments or other changes are made to the application.
         /// There are some operations we want to perform whenever this happens.