Skip to content

Commit a5fc0ea

Browse files
authored
Merge pull request #9475 from dotnet/darc-main-98e86083-1434-4a37-baaf-d035d44f0e26
[main] Source code updates from dotnet/dotnet
2 parents 1b99d25 + 88c42f6 commit a5fc0ea

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

eng/Version.Details.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25531.101</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.0-rc.1.25531.101</SystemCommandLinePackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25553.108</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.0-rc.1.25553.108</SystemCommandLinePackageVersion>
1111
<!-- _git/dotnet-runtime dependencies -->
1212
<MicrosoftBclAsyncInterfacesPackageVersion>9.0.3</MicrosoftBclAsyncInterfacesPackageVersion>
1313
<MicrosoftExtensionsLoggingPackageVersion>9.0.3</MicrosoftExtensionsLoggingPackageVersion>

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="6ad4d0db4a7569ab9944901096381c5eff133709" BarId="289141" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2" BarId="289373" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25531.101">
5+
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25553.108">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
7+
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25531.101">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25553.108">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>6ad4d0db4a7569ab9944901096381c5eff133709</Sha>
13+
<Sha>d9ffe06a35d2ad6ab93f41f7f6a37843d6f686a2</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build. We'll still update manually -->
1616
<Dependency Name="System.Formats.Asn1" Version="9.0.3">

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ steps:
2828
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
2929
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
3030
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
31+
-runtimeSourceFeed https://ci.dot.net/internal
32+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
3133
'$(publishing-dnceng-devdiv-code-r-build-re)'
3234
'$(MaestroAccessToken)'
3335
'$(dn-bot-all-orgs-artifact-feeds-rw)'

eng/common/post-build/redact-logs.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ param(
77
# File with strings to redact - separated by newlines.
88
# For comments start the line with '# ' - such lines are ignored
99
[Parameter(Mandatory=$false)][string] $TokensFilePath,
10-
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact
10+
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact,
11+
[Parameter(Mandatory=$false)][string] $runtimeSourceFeed,
12+
[Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey
1113
)
1214

1315
try {

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"dotnet": "10.0.100-rc.2.25502.107"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.101"
16+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25553.108"
1717
}
1818
}

0 commit comments

Comments
 (0)