Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#7355)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20231219.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23615.2 -> To Version 9.0.0-beta.23619.2

* Update dependencies from https://github.com/dotnet/arcade build 20231219.4

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23615.2 -> To Version 9.0.0-beta.23619.4

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
dotnet-maestro[bot] and dotnet-maestro[bot] committed Dec 20, 2023
1 parent bf4ff1e commit 7b5f897
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 33 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23615.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23620.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>17dff488fa9de3f27edf2e42516d06d538ed3625</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23615.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23620.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>17dff488fa9de3f27edf2e42516d06d538ed3625</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
3 changes: 3 additions & 0 deletions eng/common/build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*"
exit /b %ErrorLevel%
2 changes: 1 addition & 1 deletion eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))

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

- ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}:
- task: DownloadPipelineArtifact@2
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- task: NuGetAuthenticate@0
- task: NuGetAuthenticate@1

- task: PowerShell@2
displayName: Publish Build Assets
Expand Down
4 changes: 2 additions & 2 deletions eng/common/templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ stages:
# This is necessary whenever we want to publish/restore to an AzDO private feed
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
# otherwise it'll complain about accessing a private feed.
- task: NuGetAuthenticate@0
- task: NuGetAuthenticate@1
displayName: 'Authenticate to AzDO Feeds'

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

- task: NuGetAuthenticate@0
- task: NuGetAuthenticate@1

- task: PowerShell@2
displayName: Publish Using Darc
Expand Down
49 changes: 25 additions & 24 deletions eng/common/templates/steps/publish-logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,31 @@ steps:
Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
continueOnError: true
condition: always()

- task: PowerShell@2
displayName: Redact Logs
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1
# For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml
# Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
# If the file exists - sensitive data for redaction will be sourced from it
# (single entry per line, lines starting with '# ' are considered comments and skipped)
arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs'
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
-TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
'$(publishing-dnceng-devdiv-code-r-build-re)'
'$(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)'
${{parameters.CustomSensitiveDataList}}
continueOnError: true
condition: always()


# TODO: Disabled - https://github.com/dotnet/dnceng/issues/1675
# - task: PowerShell@2
# displayName: Redact Logs
# inputs:
# filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1
# # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml
# # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
# # If the file exists - sensitive data for redaction will be sourced from it
# # (single entry per line, lines starting with '# ' are considered comments and skipped)
# arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs'
# -BinlogToolVersion ${{parameters.BinlogToolVersion}}
# -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
# '$(publishing-dnceng-devdiv-code-r-build-re)'
# '$(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)'
# ${{parameters.CustomSensitiveDataList}}
# continueOnError: true
# condition: always()

- task: PublishBuildArtifacts@1
displayName: Publish Logs
inputs:
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23615.2"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23620.1"
}
}

0 comments on commit 7b5f897

Please sign in to comment.