From 4d3c6a984b07b25c40ac96eff0d315bac8e70a70 Mon Sep 17 00:00:00 2001
From: Chidozie Ononiwu <chononiw@microsoft.com>
Date: Tue, 15 Sep 2020 19:49:10 -0700
Subject: [PATCH] Add some changes in eng/common to test things

---
 eng/common/scripts/modules/ChangeLog-Operations.psm1 | 2 +-
 eng/common/scripts/modules/Package-Properties.psm1   | 1 +
 eng/pipelines/eng-common-sync.yml                    | 2 +-
 eng/pipelines/templates/steps/sync-directory.yml     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/eng/common/scripts/modules/ChangeLog-Operations.psm1 b/eng/common/scripts/modules/ChangeLog-Operations.psm1
index 5aed584d018b..46e4fd9302f4 100644
--- a/eng/common/scripts/modules/ChangeLog-Operations.psm1
+++ b/eng/common/scripts/modules/ChangeLog-Operations.psm1
@@ -1,5 +1,5 @@
 # Common Changelog Operations
-
+# This Files has been retired
 $RELEASE_TITLE_REGEX = "(?<releaseNoteTitle>^\#+.*(?<version>\b\d+\.\d+\.\d+([^0-9\s][^\s:]+)?)(\s(?<releaseStatus>\(Unreleased\)|\(\d{4}-\d{2}-\d{2}\)))?)"
 
 # Returns a Collection of changeLogEntry object containing changelog info for all version present in the gived CHANGELOG
diff --git a/eng/common/scripts/modules/Package-Properties.psm1 b/eng/common/scripts/modules/Package-Properties.psm1
index b0572a71d449..61c45455f0d0 100644
--- a/eng/common/scripts/modules/Package-Properties.psm1
+++ b/eng/common/scripts/modules/Package-Properties.psm1
@@ -1,3 +1,4 @@
+# This Files has been retired
 # Helper functions for retireving useful information from azure-sdk-for-* repo
 # Example Use : Import-Module .\eng\common\scripts\modules
 class PackageProps
diff --git a/eng/pipelines/eng-common-sync.yml b/eng/pipelines/eng-common-sync.yml
index 9326966e57de..25bfdde63073 100644
--- a/eng/pipelines/eng-common-sync.yml
+++ b/eng/pipelines/eng-common-sync.yml
@@ -33,7 +33,7 @@ stages:
         - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
           - pwsh: |
               $patchDir = "$(System.DefaultWorkingDirectory)/patchfiles"
-              $patchfiles = git format-patch $(system.pullRequest.sourceBranch)...$(system.pullRequest.targetBranch) ${{ parameters.DirectoryToSync }} -o $patchDir
+              $patchfiles = git format-patch HEAD~1...origin/master  -- ${{ parameters.DirectoryToSync }} -o $patchDir
               if ($patchfiles)
               {
                 echo "##vso[task.setvariable variable=PatchFilesLocation]$patchDir"
diff --git a/eng/pipelines/templates/steps/sync-directory.yml b/eng/pipelines/templates/steps/sync-directory.yml
index 8fc6105ba430..6ddedf071843 100644
--- a/eng/pipelines/templates/steps/sync-directory.yml
+++ b/eng/pipelines/templates/steps/sync-directory.yml
@@ -20,7 +20,7 @@ steps:
         if ($PatchFilesLocation)
         {
           pushd ${{ repo }}
-          $results = Get-ChildItem $PatchFilesLocation | % { $git am $_.FullName }
+          $results = Get-ChildItem $PatchFilesLocation | % { git am $_.FullName }
           if ($results.Count -ne (Get-ChildItem $PatchFilesLocation).Count)
           {
             Write-Output "Failed to apply patch files"