diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db4ea586c..a6562d867 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -23,9 +23,9 @@ https://github.com/microsoft/CsWinRT fa7f5565cb53353dc15c28a09ebd500577dc0b72 - + https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal - 1a9fa3a608b65139548ed8c1dc600e539c61b10d + 2d121ebc5bb8953726f46337535f28a2e0292734 diff --git a/eng/common/AzurePipelinesTemplates/WindowsAppSDK-SyncMirror-Steps.yml b/eng/common/AzurePipelinesTemplates/WindowsAppSDK-SyncMirror-Steps.yml index d73b62d9d..bf7c88b44 100644 --- a/eng/common/AzurePipelinesTemplates/WindowsAppSDK-SyncMirror-Steps.yml +++ b/eng/common/AzurePipelinesTemplates/WindowsAppSDK-SyncMirror-Steps.yml @@ -1,8 +1,17 @@ +# This yml template is use to facilitate syncing public repositories to private mirrored repository. +# These steps must be run on the target repository that is being synced. + +# Requirements: +# The pipeline agent that runs this must have "Contribute" permissions on the target repository. + parameters: - - name: PublicRepository + - name: SourceRepository type: string default: "" - - name: Branch + - name: SourceBranch + type: string + default: "" + - name: TargetBranch type: string default: "" @@ -14,15 +23,21 @@ steps: inputs: targetType: 'inline' script: | - $publicRepo = "${{ parameters.PublicRepository }}" - $branch = "${{ parameters.Branch }}" - git fetch - git checkout $branch - git pull origin $branch - git remote add public $publicRepo + Write-Host "Sourcebranch " + "${{ parameters.SourceBranch }}" + Write-Host "TargetBranch " + "${{ parameters.TargetBranch }}" + + $repo = "${{ parameters.SourceRepository }}" + git remote add mirror $repo git remote - git fetch public - git pull public $branch + + $target = "${{ parameters.TargetBranch }}" + git fetch origin $target + git checkout $target + git pull origin $target + + $source = "${{ parameters.SourceBranch }}" + git fetch mirror $source + git pull mirror $source - task: CmdLine@2 inputs: diff --git a/global.json b/global.json index 4fd0a76a2..dad53ce72 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "6.0.104" }, "msbuild-sdks": { - "Microsoft.WinAppSDK.EngCommon": "1.2.220923.1" + "Microsoft.WinAppSDK.EngCommon": "1.2.220923.2" } }