Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20231…
Browse files Browse the repository at this point in the history
…219.2 (#8571)

[main] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Dec 19, 2023
1 parent 0defabc commit 964689a
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 38 deletions.
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,25 +157,25 @@
</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.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>28b89011cb850ec0fc78a0897f59acc05409e941</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23615.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23619.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>28b89011cb850ec0fc78a0897f59acc05409e941</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23615.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23619.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>28b89011cb850ec0fc78a0897f59acc05409e941</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.23615.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.23619.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>28b89011cb850ec0fc78a0897f59acc05409e941</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23615.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23619.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f7acdc5f9b87f260119bb32d01c24d2773773eb</Sha>
<Sha>28b89011cb850ec0fc78a0897f59acc05409e941</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
<Uri>https://github.com/dotnet/sourcelink</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.23615.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.23615.2</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.23619.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.23619.2</MicrosoftDotNetCodeAnalysisPackageVersion>
</PropertyGroup>
<!-- Sourcelink -->
<PropertyGroup>
Expand Down
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%
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
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23615.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23615.2"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23619.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23619.2"
},
"sdk": {
"version": "9.0.100-alpha.1.23615.4"
Expand Down

0 comments on commit 964689a

Please sign in to comment.