fix: merges that fail after 2 minutes continue to retry (#60)

ewingjm · Feb 6, 2021 · efd3457 · efd3457
1 parent 1ec40d1
commit efd3457
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/scripts/Add-BuildTagForEachUpdatedSolution.ps1 b/scripts/Add-BuildTagForEachUpdatedSolution.ps1
@@ -2,7 +2,7 @@ $resultArray = git show --name-only
 [System.Collections.ArrayList]$changedSolutions = @()
 
 foreach ($_ in $resultArray) {
-  if ($_.StartsWith("src/solutions") -and $_.Contains("Extract")) {
+  if ($_.StartsWith("src/solutions")) {
     $solutionName = $_.Split("/")[2]
 
     if (!$changedSolutions.Contains($solutionName)) {
@@ -13,4 +13,4 @@ foreach ($_ in $resultArray) {
 }
 $output = $changedSolutions -Join ','  
 
-Write-Host "##vso[task.setvariable variable=solutionList;]$output"
+Write-Host "##vso[task.setvariable variable=solutionList]$output"
diff --git a/src/solutions/devhub_DevelopmentHub_Develop/Extract/Other/Solution.xml b/src/solutions/devhub_DevelopmentHub_Develop/Extract/Other/Solution.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImportExportXml version="9.2.20123.140" SolutionPackageVersion="9.2" languagecode="1033" generatedBy="CrmLive" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<ImportExportXml version="9.2.21012.135" SolutionPackageVersion="9.2" languagecode="1033" generatedBy="CrmLive" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <SolutionManifest>
     <UniqueName>devhub_DevelopmentHub_Develop</UniqueName>
     <LocalizedNames>
@@ -401,7 +401,7 @@
         <Dependent key="33" type="60" displayName="Information" parentDisplayName="Solution Merge" id="{6f14717f-673c-45a3-b862-4c3e7408be3f}" />
       </MissingDependency>
       <MissingDependency>
-        <Required key="34" type="66" schemaName="MscrmControls.FlipSwitch.FlipSwitchControl" displayName="MscrmControls.FlipSwitch.FlipSwitchControl" solution="CustomControlsCore (9.2.20123.00140)" />
+        <Required key="34" type="66" schemaName="MscrmControls.FlipSwitch.FlipSwitchControl" displayName="MscrmControls.FlipSwitch.FlipSwitchControl" solution="CustomControlsCore (9.2.21012.00135)" />
         <Dependent key="33" type="60" displayName="Information" parentDisplayName="Solution Merge" id="{6f14717f-673c-45a3-b862-4c3e7408be3f}" />
       </MissingDependency>
       <MissingDependency>