Skip to content

Commit 4f0be31

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#80989)
1 parent f695099 commit 4f0be31

File tree

6 files changed

+22
-18
lines changed

6 files changed

+22
-18
lines changed

‎eng/Version.Details.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ This file should be imported by eng/Versions.props
3838
<SystemThreadingTasksDataflowPackageVersion>9.0.0</SystemThreadingTasksDataflowPackageVersion>
3939
<SystemWindowsExtensionsPackageVersion>9.0.0</SystemWindowsExtensionsPackageVersion>
4040
<!-- dotnet/arcade dependencies -->
41-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25527.2</MicrosoftDotNetArcadeSdkPackageVersion>
42-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25527.2</MicrosoftDotNetHelixSdkPackageVersion>
43-
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.25527.2</MicrosoftDotNetXliffTasksPackageVersion>
44-
<!-- dotnet/arcade-services dependencies -->
45-
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25503.1</MicrosoftDotNetDarcLibPackageVersion>
41+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25531.1</MicrosoftDotNetArcadeSdkPackageVersion>
42+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25531.1</MicrosoftDotNetHelixSdkPackageVersion>
43+
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.25531.1</MicrosoftDotNetXliffTasksPackageVersion>
4644
<!-- dotnet/symreader dependencies -->
4745
<MicrosoftDiaSymReaderPackageVersion>2.0.0</MicrosoftDiaSymReaderPackageVersion>
46+
<!-- dotnet/arcade-services dependencies -->
47+
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25503.1</MicrosoftDotNetDarcLibPackageVersion>
4848
<!-- dotnet/roslyn-analyzers dependencies -->
4949
<MicrosoftCodeAnalysisAnalyzersPackageVersion>3.11.0</MicrosoftCodeAnalysisAnalyzersPackageVersion>
5050
<MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>3.3.0</MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion>
@@ -88,10 +88,10 @@ This file should be imported by eng/Versions.props
8888
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
8989
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
9090
<MicrosoftDotNetXliffTasksVersion>$(MicrosoftDotNetXliffTasksPackageVersion)</MicrosoftDotNetXliffTasksVersion>
91-
<!-- dotnet/arcade-services dependencies -->
92-
<MicrosoftDotNetDarcLibVersion>$(MicrosoftDotNetDarcLibPackageVersion)</MicrosoftDotNetDarcLibVersion>
9391
<!-- dotnet/symreader dependencies -->
9492
<MicrosoftDiaSymReaderVersion>$(MicrosoftDiaSymReaderPackageVersion)</MicrosoftDiaSymReaderVersion>
93+
<!-- dotnet/arcade-services dependencies -->
94+
<MicrosoftDotNetDarcLibVersion>$(MicrosoftDotNetDarcLibPackageVersion)</MicrosoftDotNetDarcLibVersion>
9595
<!-- dotnet/roslyn-analyzers dependencies -->
9696
<MicrosoftCodeAnalysisAnalyzersVersion>$(MicrosoftCodeAnalysisAnalyzersPackageVersion)</MicrosoftCodeAnalysisAnalyzersVersion>
9797
<MicrosoftCodeAnalysisAnalyzerUtilitiesVersion>$(MicrosoftCodeAnalysisAnalyzerUtilitiesPackageVersion)</MicrosoftCodeAnalysisAnalyzerUtilitiesVersion>

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,13 @@
115115
</Dependency>
116116
</ProductDependencies>
117117
<ToolsetDependencies>
118-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25527.2">
118+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25531.1">
119119
<Uri>https://github.com/dotnet/arcade</Uri>
120-
<Sha>d48732057be73512b3bac9c01eeacd59398c16d5</Sha>
120+
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25527.2">
122+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25531.1">
123123
<Uri>https://github.com/dotnet/arcade</Uri>
124-
<Sha>d48732057be73512b3bac9c01eeacd59398c16d5</Sha>
124+
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
125125
</Dependency>
126126
<Dependency Name="Microsoft.DiaSymReader" Version="2.0.0">
127127
<Uri>https://github.com/dotnet/symreader</Uri>
@@ -131,9 +131,9 @@
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132132
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25527.2">
134+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25531.1">
135135
<Uri>https://github.com/dotnet/arcade</Uri>
136-
<Sha>d48732057be73512b3bac9c01eeacd59398c16d5</Sha>
136+
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25503.1">
139139
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"xcopy-msbuild": "17.14.16"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25527.2",
17-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25527.2",
16+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.1",
17+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25531.1",
1818
"Microsoft.Build.Traversal": "3.4.0"
1919
}
2020
}

‎src/Compilers/Core/MSBuildTaskTests/TestUtilities/IntegrationTestBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ protected static ProcessResult RunCommandLineCompiler(
119119
additionalEnvironmentVars);
120120
}
121121

122-
[Theory, CombinatorialData]
122+
[Theory(Skip = "https://github.com/dotnet/roslyn/issues/80991"), CombinatorialData]
123123
public void SdkBuild_Csc(bool useSharedCompilation)
124124
{
125125
var result = RunMsbuild(
@@ -151,7 +151,7 @@ class Program { static void Main() { System.Console.WriteLine("Hello from file")
151151
Assert.Contains(ExecutionConditionUtil.IsWindows ? "csc.exe" : "csc", result.Output);
152152
}
153153

154-
[Theory, CombinatorialData]
154+
[Theory(Skip = "https://github.com/dotnet/roslyn/issues/80991"), CombinatorialData]
155155
public void SdkBuild_Vbc(bool useSharedCompilation)
156156
{
157157
var result = RunMsbuild(

0 commit comments

Comments
 (0)