Skip to content

Commit 4c84ee0

Browse files
authored
[main] Update dependencies from dotnet/arcade (#17044)
2 parents 8bce435 + 648cff3 commit 4c84ee0

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,18 +202,18 @@
202202
</Dependency>
203203
</ProductDependencies>
204204
<ToolsetDependencies>
205-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23369.2">
205+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23370.6">
206206
<Uri>https://github.com/dotnet/arcade</Uri>
207-
<Sha>9fba71ca242ef84c4b7696c380cc00efe734adb3</Sha>
207+
<Sha>a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745</Sha>
208208
<SourceBuild RepoName="arcade" ManagedOnly="true" />
209209
</Dependency>
210-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23369.2">
210+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23370.6">
211211
<Uri>https://github.com/dotnet/arcade</Uri>
212-
<Sha>9fba71ca242ef84c4b7696c380cc00efe734adb3</Sha>
212+
<Sha>a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745</Sha>
213213
</Dependency>
214-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23369.2">
214+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23370.6">
215215
<Uri>https://github.com/dotnet/arcade</Uri>
216-
<Sha>9fba71ca242ef84c4b7696c380cc00efe734adb3</Sha>
216+
<Sha>a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745</Sha>
217217
</Dependency>
218218
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23368.2">
219219
<Uri>https://github.com/dotnet/arcade-services</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</PropertyGroup>
3737
<PropertyGroup>
3838
<!-- Dependency from https://github.com/dotnet/arcade -->
39-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23369.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
39+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23370.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4040
</PropertyGroup>
4141
<PropertyGroup>
4242
<!-- Dependency from https://github.com/dotnet/arcade-services -->

eng/common/sdl/configure-sdl-tool.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ try {
9393
}
9494
'binskim' {
9595
if ($targetDirectory) {
96-
$tool.Args += "`"Target < $TargetDirectory\**`""
96+
# Binskim crashes due to specific PDBs. GitHub issue: https://github.com/microsoft/binskim/issues/924.
97+
# We are excluding all `_.pdb` files from the scan.
98+
$tool.Args += "`"Target < $TargetDirectory\**;-:file|$TargetDirectory\**\_.pdb`""
9799
}
98100
$tool.Args += $BinskimAdditionalRunConfigParams
99101
}

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cmake": "3.21.0"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23369.2",
15-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23369.2"
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23370.6",
15+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23370.6"
1616
}
1717
}

0 commit comments

Comments
 (0)