[main] Update dependencies from dotnet/arcade (#18002)

[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2023-12-19 21:23:52 +00:00 committed by GitHub
parent 4ce220694e
commit dac1a0f786
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 35 deletions

View file

@ -211,18 +211,18 @@
</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.23619.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>7e95c635fb04fb81595c777ab6f3701474b9da43</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23615.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23619.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>7e95c635fb04fb81595c777ab6f3701474b9da43</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23615.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23619.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>7e95c635fb04fb81595c777ab6f3701474b9da43</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -232,9 +232,9 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23615.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23619.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>7e95c635fb04fb81595c777ab6f3701474b9da43</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri>

View file

@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23615.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23619.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

3
eng/common/build.cmd Normal file
View file

@ -0,0 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*"
exit /b %ErrorLevel%

View file

@ -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:

View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23615.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23615.2"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23619.4",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23619.4"
}
}