From: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 02:08:49 +0000 (-0700) Subject: [main] Update dependencies from dotnet/arcade (#4802) X-Git-Tag: accepted/tizen/unified/20241231.014852~39^2^2~130 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02da8b2248f6e479c461ad7bbe0afecc6816ef8e;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git [main] Update dependencies from dotnet/arcade (#4802) This pull request updates the following dependencies [marker]: <> (Begin:6d3f346d-45bf-4275-0e83-08d8e40a189f) ## From https://github.com/dotnet/arcade - **Subscription**: 6d3f346d-45bf-4275-0e83-08d8e40a189f - **Build**: 20240718.9 - **Date Produced**: July 18, 2024 4:59:11 PM UTC - **Commit**: b4e499d1f6e6b3a981feabfed290d99261762382 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 9.0.0-beta.24360.4 to 9.0.0-beta.24368.9][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.24360.4 to 9.0.0-beta.24368.9][1] - **Microsoft.DotNet.CodeAnalysis**: [from 9.0.0-beta.24360.4 to 9.0.0-beta.24368.9][1] [1]: https://github.com/dotnet/arcade/compare/731d793be2...b4e499d1f6 [DependencyUpdate]: <> (End) [marker]: <> (End:6d3f346d-45bf-4275-0e83-08d8e40a189f) --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Mike McLaughlin --- diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6801f40b..cfc5392f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,19 +10,19 @@ - + https://github.com/dotnet/arcade - 731d793be2d0a66bafc96b1a79dc96b4d1f0301b + b4e499d1f6e6b3a981feabfed290d99261762382 - + https://github.com/dotnet/arcade - 731d793be2d0a66bafc96b1a79dc96b4d1f0301b + b4e499d1f6e6b3a981feabfed290d99261762382 - + https://github.com/dotnet/arcade - 731d793be2d0a66bafc96b1a79dc96b4d1f0301b + b4e499d1f6e6b3a981feabfed290d99261762382 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 96158dc02..d60c54e7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 8.0.0 8.0.4 2.0.3 - 9.0.0-beta.24360.4 + 9.0.0-beta.24368.9 1.2.0-beta.406 7.0.0-beta.22316.2 10.0.18362 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index ec3cd1419..3d3356e31 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -143,9 +143,10 @@ jobs: scriptType: ps scriptLocation: scriptPath scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: > + -BuildId $(BARBuildId) -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 20924366b..454fd75c7 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -307,9 +307,10 @@ stages: scriptType: ps scriptLocation: scriptPath scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: > + -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/core-templates/steps/get-federated-access-token.yml b/eng/common/core-templates/steps/get-federated-access-token.yml index c8c49cc0e..3a4d4410c 100644 --- a/eng/common/core-templates/steps/get-federated-access-token.yml +++ b/eng/common/core-templates/steps/get-federated-access-token.yml @@ -3,6 +3,14 @@ parameters: type: string - name: outputVariableName type: string +- name: is1ESPipeline + type: boolean +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' # Resource to get a token for. Common values include: # - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps # - 'https://storage.azure.com/' for storage @@ -10,10 +18,16 @@ parameters: - name: resource type: string default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false steps: - task: AzureCLI@2 displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' @@ -25,4 +39,4 @@ steps: exit 1 } Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 8c5ea77b5..80788c523 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -32,7 +32,6 @@ steps: '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' '$(akams-client-id)' - '$(akams-client-secret)' '$(microsoft-symbol-server-pat)' '$(symweb-symbol-server-pat)' '$(dn-bot-all-orgs-build-rw-code-rw)' diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 4ff587ca4..90b58e32a 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -42,6 +42,7 @@ try { --azdev-pat "$AzdoToken" ` --bar-uri "$MaestroApiEndPoint" ` --ci ` + --verbose ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/global.json b/global.json index 533f44729..77589de92 100644 --- a/global.json +++ b/global.json @@ -16,6 +16,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24368.9" } } diff --git a/src/tests/dotnet-counters/CounterMonitorPayloadTests.cs b/src/tests/dotnet-counters/CounterMonitorPayloadTests.cs index aa934bc14..aee7cb9a5 100644 --- a/src/tests/dotnet-counters/CounterMonitorPayloadTests.cs +++ b/src/tests/dotnet-counters/CounterMonitorPayloadTests.cs @@ -251,7 +251,7 @@ namespace DotnetCounters.UnitTests string tag = Constants.TagKey + "=" + Constants.TagValue + tagSeparator + Constants.PercentileKey + "="; HashSet expectedTags = new() { $"{tag}{Constants.Quantile50}", $"{tag}{Constants.Quantile95}", $"{tag}{Constants.Quantile99}" }; Assert.Equal(expectedTags.AsEnumerable(), metricComponents.Where(c => c.CounterName == Constants.TestHistogramName).Select(c => c.Tags).Distinct()); - Assert.Empty(metricComponents.Where(c => c.CounterName == Constants.TestCounterName).Where(c => c.Tags != string.Empty)); + Assert.DoesNotContain(metricComponents.Where(c => c.CounterName == Constants.TestCounterName), c => c.Tags != string.Empty); var actualCounterValues = metricComponents.Where(c => c.CounterName == Constants.TestCounterName).Select(c => c.Value);