Skip to content

Commit bec4063

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (dotnet#42249)
[main] Update dependencies from dotnet/arcade - Merge branch 'main' into darc-main-0cef5441-ca5d-478d-9a91-e73a16dded49 - Fix xUnit2029 warning
1 parent 5c87259 commit bec4063

File tree

9 files changed

+45
-29
lines changed

9 files changed

+45
-29
lines changed

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -581,34 +581,34 @@
581581
</Dependency>
582582
</ProductDependencies>
583583
<ToolsetDependencies>
584-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24360.4">
584+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24368.9">
585585
<Uri>https://github.com/dotnet/arcade</Uri>
586-
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
586+
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
587587
</Dependency>
588-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24360.4">
588+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24368.9">
589589
<Uri>https://github.com/dotnet/arcade</Uri>
590-
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
590+
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
591591
</Dependency>
592-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24360.4">
592+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24368.9">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
594+
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24360.4">
596+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24368.9">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
598+
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24360.4">
600+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24368.9">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
602+
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24360.4">
604+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24368.9">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
606+
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
607607
</Dependency>
608608
<!-- Intermediate is necessary for source build. -->
609-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24360.4">
609+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24368.9">
610610
<Uri>https://github.com/dotnet/arcade</Uri>
611-
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
611+
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
612612
<SourceBuild RepoName="arcade" ManagedOnly="true" />
613613
</Dependency>
614614
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-preview.7.24366.18">

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,10 @@
308308
</PropertyGroup>
309309
<PropertyGroup>
310310
<!-- Dependencies from https://github.com/dotnet/arcade -->
311-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
312-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24360.4</MicrosoftDotNetSignToolVersion>
313-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24360.4</MicrosoftDotNetXliffTasksVersion>
314-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24360.4</MicrosoftDotNetXUnitExtensionsVersion>
311+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24368.9</MicrosoftDotNetBuildTasksInstallersPackageVersion>
312+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24368.9</MicrosoftDotNetSignToolVersion>
313+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24368.9</MicrosoftDotNetXliffTasksVersion>
314+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24368.9</MicrosoftDotNetXUnitExtensionsVersion>
315315
</PropertyGroup>
316316
<PropertyGroup>
317317
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,10 @@ jobs:
143143
scriptType: ps
144144
scriptLocation: scriptPath
145145
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
146-
arguments: -BuildId $(BARBuildId)
146+
arguments: >
147+
-BuildId $(BARBuildId)
147148
-PublishingInfraVersion 3
148-
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
149+
-AzdoToken '$(System.AccessToken)'
149150
-WaitPublishingFinish true
150151
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
151152
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/core-templates/post-build/post-build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,10 @@ stages:
307307
scriptType: ps
308308
scriptLocation: scriptPath
309309
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
310-
arguments: -BuildId $(BARBuildId)
310+
arguments: >
311+
-BuildId $(BARBuildId)
311312
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
312-
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
313+
-AzdoToken '$(System.AccessToken)'
313314
-WaitPublishingFinish true
314315
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
315316
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/core-templates/steps/get-federated-access-token.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,31 @@ parameters:
33
type: string
44
- name: outputVariableName
55
type: string
6+
- name: is1ESPipeline
7+
type: boolean
8+
- name: stepName
9+
type: string
10+
default: 'getFederatedAccessToken'
11+
- name: condition
12+
type: string
13+
default: ''
614
# Resource to get a token for. Common values include:
715
# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps
816
# - 'https://storage.azure.com/' for storage
917
# Defaults to Azure DevOps
1018
- name: resource
1119
type: string
1220
default: '499b84ac-1321-427f-aa17-267ca6975798'
21+
- name: isStepOutputVariable
22+
type: boolean
23+
default: false
1324

1425
steps:
1526
- task: AzureCLI@2
1627
displayName: 'Getting federated access token for feeds'
28+
name: ${{ parameters.stepName }}
29+
${{ if ne(parameters.condition, '') }}:
30+
condition: ${{ parameters.condition }}
1731
inputs:
1832
azureSubscription: ${{ parameters.federatedServiceConnection }}
1933
scriptType: 'pscore'
@@ -25,4 +39,4 @@ steps:
2539
exit 1
2640
}
2741
Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value"
28-
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken"
42+
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"

‎eng/common/core-templates/steps/publish-logs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ steps:
3232
'$(MaestroAccessToken)'
3333
'$(dn-bot-all-orgs-artifact-feeds-rw)'
3434
'$(akams-client-id)'
35-
'$(akams-client-secret)'
3635
'$(microsoft-symbol-server-pat)'
3736
'$(symweb-symbol-server-pat)'
3837
'$(dn-bot-all-orgs-build-rw-code-rw)'

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ try {
4242
--azdev-pat "$AzdoToken" `
4343
--bar-uri "$MaestroApiEndPoint" `
4444
--ci `
45+
--verbose `
4546
@optionalParams
4647

4748
if ($LastExitCode -ne 0) {

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.4",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24360.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24368.9",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24368.9",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎test/Microsoft.DotNet.ApiCompat.IntegrationTests/Task/ValidatePackageTargetIntegrationTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,9 @@ public void ValidateMissingReferencesIsOnlyLoggedWhenRunningWithReferences(bool
331331
validator.Validate(new PackageValidatorOption(package));
332332

333333
if (!useReferences)
334-
Assert.Empty(log.warnings.Where(e => e.Contains("CP1003")));
334+
Assert.DoesNotContain(log.warnings, e => e.Contains("CP1003"));
335335
else
336-
Assert.NotEmpty(log.warnings.Where(e => e.Contains("CP1003")));
336+
Assert.Contains(log.warnings, e => e.Contains("CP1003"));
337337
}
338338

339339
[RequiresMSBuildVersionFact("17.0.0.32901", Skip = "https://github.com/dotnet/sdk/issues/23533")]
@@ -355,7 +355,7 @@ public void ValidateReferencesAreRespectedForPlatformSpecificTFMs()
355355

356356
validator.Validate(new PackageValidatorOption(package));
357357

358-
Assert.Empty(log.warnings.Where(e => e.Contains("CP1003")));
358+
Assert.Contains(log.warnings, e => e.Contains("CP1003"));
359359
}
360360

361361
[RequiresMSBuildVersionFact("17.0.0.32901", Skip = "https://github.com/dotnet/sdk/issues/23533")]

0 commit comments

Comments
 (0)