mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
v-wuzhai 2023-12-24 18:12:30 -08:00 committed by GitHub
commit 1eb031645b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -211,18 +211,18 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23620.7"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23621.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c0c425d9b85b125bbaf59581639355f1d2b99149</Sha> <Sha>a1e4795fcba619bba3534700b660ad6d2e3ce859</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23620.7"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23621.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c0c425d9b85b125bbaf59581639355f1d2b99149</Sha> <Sha>a1e4795fcba619bba3534700b660ad6d2e3ce859</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23620.7"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23621.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c0c425d9b85b125bbaf59581639355f1d2b99149</Sha> <Sha>a1e4795fcba619bba3534700b660ad6d2e3ce859</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23621.3"> <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23621.3">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
@ -232,9 +232,9 @@
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>702f946f89ace6197fdca2ac309d32187c4bc1bd</Sha> <Sha>702f946f89ace6197fdca2ac309d32187c4bc1bd</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23620.7"> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23621.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c0c425d9b85b125bbaf59581639355f1d2b99149</Sha> <Sha>a1e4795fcba619bba3534700b660ad6d2e3ce859</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12"> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>

2
eng/Versions.props
View file

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

45
eng/common/templates/steps/publish-logs.yml
View file

@ -16,29 +16,28 @@ steps:
continueOnError: true continueOnError: true
condition: always() condition: always()
# TODO: Disabled - https://github.com/dotnet/dnceng/issues/1675 - task: PowerShell@2
# - task: PowerShell@2 displayName: Redact Logs
# displayName: Redact Logs inputs:
# inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1
# 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
# # 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'
# # 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
# # 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)
# # (single entry per line, lines starting with '# ' are considered comments and skipped) arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs'
# arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}}
# -BinlogToolVersion ${{parameters.BinlogToolVersion}} -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
# -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)'
# '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)'
# '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)'
# '$(dn-bot-all-orgs-artifact-feeds-rw)' '$(akams-client-id)'
# '$(akams-client-id)' '$(akams-client-secret)'
# '$(akams-client-secret)' '$(microsoft-symbol-server-pat)'
# '$(microsoft-symbol-server-pat)' '$(symweb-symbol-server-pat)'
# '$(symweb-symbol-server-pat)' '$(dn-bot-all-orgs-build-rw-code-rw)'
# '$(dn-bot-all-orgs-build-rw-code-rw)' ${{parameters.CustomSensitiveDataList}}
# ${{parameters.CustomSensitiveDataList}} continueOnError: true
# continueOnError: true condition: always()
# condition: always()
- task: PublishBuildArtifacts@1 - task: PublishBuildArtifacts@1
displayName: Publish Logs displayName: Publish Logs

4
global.json
View file

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