Skip to content

Commit 8941cb3

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#5380)
[main] Update dependencies from dotnet/arcade
1 parent b179144 commit 8941cb3

File tree

13 files changed

+68
-72
lines changed

13 files changed

+68
-72
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23611.2">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23620.1">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
9+
<Sha>17dff488fa9de3f27edf2e42516d06d538ed3625</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23611.2">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23620.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
13+
<Sha>17dff488fa9de3f27edf2e42516d06d538ed3625</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23611.2">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23620.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
17+
<Sha>17dff488fa9de3f27edf2e42516d06d538ed3625</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.23611.2</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23611.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.23620.1</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23620.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

‎eng/common/build.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@echo off
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*"
3+
exit /b %ErrorLevel%

‎eng/common/sdl/trim-assets-version.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ catch {
7272
Write-Host $_
7373
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
7474
ExitWithExitCode 1
75-
}
75+
}

‎eng/common/templates/job/job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
137137

138138
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
139-
- task: NuGetAuthenticate@0
139+
- task: NuGetAuthenticate@1
140140

141141
- ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}:
142142
- task: DownloadPipelineArtifact@2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
condition: ${{ parameters.condition }}
7373
continueOnError: ${{ parameters.continueOnError }}
7474

75-
- task: NuGetAuthenticate@0
75+
- task: NuGetAuthenticate@1
7676

7777
- task: PowerShell@2
7878
displayName: Publish Build Assets

‎eng/common/templates/job/source-index-stage1.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20230228.2
3+
sourceIndexPackageVersion: 1.0.1-20231213.4
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []
@@ -30,20 +30,20 @@ jobs:
3030
pool:
3131
${{ if eq(variables['System.TeamProject'], 'public') }}:
3232
name: $(DncEngPublicBuildPool)
33-
demands: ImageOverride -equals windows.vs2019.amd64.open
33+
demands: ImageOverride -equals windows.vs2022.amd64.open
3434
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3535
name: $(DncEngInternalBuildPool)
36-
demands: ImageOverride -equals windows.vs2019.amd64
36+
demands: ImageOverride -equals windows.vs2022.amd64
3737

3838
steps:
3939
- ${{ each preStep in parameters.preSteps }}:
4040
- ${{ preStep }}
4141

4242
- task: UseDotNet@2
43-
displayName: Use .NET Core SDK 6
43+
displayName: Use .NET 8 SDK
4444
inputs:
4545
packageType: sdk
46-
version: 6.0.x
46+
version: 8.0.x
4747
installationPath: $(Agent.TempDirectory)/dotnet
4848
workingDirectory: $(Agent.TempDirectory)
4949

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ stages:
169169
# This is necessary whenever we want to publish/restore to an AzDO private feed
170170
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
171171
# otherwise it'll complain about accessing a private feed.
172-
- task: NuGetAuthenticate@0
172+
- task: NuGetAuthenticate@1
173173
displayName: 'Authenticate to AzDO Feeds'
174174

175175
# Signing validation will optionally work with the buildmanifest file which is downloaded from
@@ -267,7 +267,7 @@ stages:
267267
BARBuildId: ${{ parameters.BARBuildId }}
268268
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
269269

270-
- task: NuGetAuthenticate@0
270+
- task: NuGetAuthenticate@1
271271

272272
- task: PowerShell@2
273273
displayName: Publish Using Darc

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

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,31 @@ steps:
1515
Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
1616
continueOnError: true
1717
condition: always()
18-
19-
- task: PowerShell@2
20-
displayName: Redact Logs
21-
inputs:
22-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1
23-
# For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml
24-
# Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
25-
# If the file exists - sensitive data for redaction will be sourced from it
26-
# (single entry per line, lines starting with '# ' are considered comments and skipped)
27-
arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs'
28-
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
29-
-TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
30-
'$(publishing-dnceng-devdiv-code-r-build-re)'
31-
'$(MaestroAccessToken)'
32-
'$(dn-bot-all-orgs-artifact-feeds-rw)'
33-
'$(akams-client-id)'
34-
'$(akams-client-secret)'
35-
'$(microsoft-symbol-server-pat)'
36-
'$(symweb-symbol-server-pat)'
37-
'$(dn-bot-all-orgs-build-rw-code-rw)'
38-
${{parameters.CustomSensitiveDataList}}
39-
continueOnError: true
40-
condition: always()
41-
18+
19+
# TODO: Disabled - https://github.com/dotnet/dnceng/issues/1675
20+
# - task: PowerShell@2
21+
# displayName: Redact Logs
22+
# inputs:
23+
# filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1
24+
# # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml
25+
# # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
26+
# # If the file exists - sensitive data for redaction will be sourced from it
27+
# # (single entry per line, lines starting with '# ' are considered comments and skipped)
28+
# arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs'
29+
# -BinlogToolVersion ${{parameters.BinlogToolVersion}}
30+
# -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
31+
# '$(publishing-dnceng-devdiv-code-r-build-re)'
32+
# '$(MaestroAccessToken)'
33+
# '$(dn-bot-all-orgs-artifact-feeds-rw)'
34+
# '$(akams-client-id)'
35+
# '$(akams-client-secret)'
36+
# '$(microsoft-symbol-server-pat)'
37+
# '$(symweb-symbol-server-pat)'
38+
# '$(dn-bot-all-orgs-build-rw-code-rw)'
39+
# ${{parameters.CustomSensitiveDataList}}
40+
# continueOnError: true
41+
# condition: always()
42+
4243
- task: PublishBuildArtifacts@1
4344
displayName: Publish Logs
4445
inputs:

‎eng/common/templates/steps/source-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ steps:
105105
Contents: |
106106
**/*.log
107107
**/*.binlog
108-
artifacts/source-build/self/prebuilt-report/**
108+
artifacts/sb/prebuilt-report/**
109109
TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
110110
CleanTargetFolder: true
111111
continueOnError: true
@@ -126,4 +126,4 @@ steps:
126126
- task: ComponentGovernanceComponentDetection@0
127127
displayName: Component Detection (Exclude upstream cache)
128128
inputs:
129-
ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
129+
ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'

0 commit comments

Comments
 (0)