Skip to content

Commit 83275b0

Browse files
committed
Merge remote-tracking branch 'origin/master' into Localization
2 parents 11db0ba + beac576 commit 83275b0

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.azure-pipelines/pipeline.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ resources:
6969
extends:
7070
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
7171
parameters:
72+
settings:
73+
skipBuildTagsForGitHubPullRequests: true
7274
featureFlags:
7375
autoBaseline: false
7476
sdl:

.vsts.release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,21 +210,21 @@ extends:
210210
displayName: Upload to Azure Blob
211211
inputs:
212212
azurePowerShellVersion: 'LatestVersion'
213-
azureSubscription: 'azure-pipelines-agent-vstsagentpackage'
213+
azureSubscription: 'azure-pipelines-agent-vstsagentpackage-oauth'
214214
scriptType: 'InlineScript'
215215
inline: |
216216
Write-Host "Preloading Azure modules." # This is for better performance, to avoid module-autoloading.
217217
Import-Module Azure, Az.Accounts, Az.Storage, Az.Cdn -ErrorAction Ignore -PassThru
218218
$uploadFiles = New-Object System.Collections.ArrayList
219219
Select-AzSubscription -SubscriptionId $(SubscriptionId)
220-
$storage = Get-AzStorageAccount -ResourceGroupName vstsagentpackage -AccountName vstsagentpackage
220+
$storageContext = New-AzStorageContext -StorageAccountName vstsagentpackage -UseConnectedAccount
221221
$versionDir = "$(AgentVersion)"
222222
Get-ChildItem -LiteralPath "$(System.ArtifactsDirectory)/agent" | ForEach-Object {
223223
$target=$_
224224
Get-ChildItem -LiteralPath "$(System.ArtifactsDirectory)/agent/$target" -Include "*.zip","*.tar.gz" | ForEach-Object {
225225
$executable = $_
226226
Write-Host "Uploading $executable to BlobStorage vstsagentpackage/agent/$versionDir"
227-
Set-AzStorageBlobContent -Context $storage.Context -Container agent -File "$(System.ArtifactsDirectory)/agent/$target/$executable" -Blob "$versionDir/$executable" -Force
227+
Set-AzStorageBlobContent -Context $storageContext -Container agent -File "$(System.ArtifactsDirectory)/agent/$target/$executable" -Blob "$versionDir/$executable" -Force
228228
$uploadFiles.Add("/agent/$versionDir/$executable")
229229
}
230230
}

src/Agent.Worker/TestResults/Utils/FeatureFlagService.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ public bool GetFeatureFlagState(string featureFlagName, Guid serviceInstanceId)
4444
}
4545
_executionContext.Debug(StringUtil.Format("{0} is off", featureFlagName));
4646
}
47-
catch
47+
catch(Exception ex)
4848
{
49-
_executionContext.Debug(StringUtil.Format("Failed to get FF {0} Value.", featureFlagName));
49+
var exceptionMessage = StringUtil.Format("Failed to get FF {0} Value. Error: {1}", featureFlagName, ex.ToString());
50+
_executionContext.Warning(exceptionMessage);
51+
Trace.Error(exceptionMessage);
5052
}
5153
return false;
5254
}

src/Misc/externals.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ NODE_VERSION="6.17.1"
1919
NODE10_VERSION="10.24.1"
2020
NODE16_VERSION="16.20.2"
2121
NODE20_VERSION="20.13.1"
22-
MINGIT_VERSION="2.43.0"
23-
FF_MINGIT_VERSION="2.44.0"
22+
MINGIT_VERSION="2.39.1"
23+
FF_MINGIT_VERSION="2.43.0"
2424
LFS_VERSION="3.3.0"
2525

2626
get_abs_path() {

0 commit comments

Comments
 (0)