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

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

Browse source
This commit is contained in:
Forgind 2023-07-21 11:29:15 -07:00 committed by GitHub
commit 4c84ee0bc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -202,18 +202,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23369.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23370.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9fba71ca242ef84c4b7696c380cc00efe734adb3</Sha>
<Sha>a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23369.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23370.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9fba71ca242ef84c4b7696c380cc00efe734adb3</Sha>
<Sha>a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23369.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23370.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9fba71ca242ef84c4b7696c380cc00efe734adb3</Sha>
<Sha>a2d7c72df5b2e36b0f69bbe12ad4d7c52793c745</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23368.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>

2
eng/Versions.props
View file

@ -36,7 +36,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23369.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23370.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

4
eng/common/sdl/configure-sdl-tool.ps1
View file

@ -93,7 +93,9 @@ try {
}
'binskim' {
if ($targetDirectory) {
$tool.Args += "`"Target < $TargetDirectory\**`""
# Binskim crashes due to specific PDBs. GitHub issue: https://github.com/microsoft/binskim/issues/924.
# We are excluding all `_.pdb` files from the scan.
$tool.Args += "`"Target < $TargetDirectory\**;-:file|$TargetDirectory\**\_.pdb`""
}
$tool.Args += $BinskimAdditionalRunConfigParams
}

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23369.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23369.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23370.6",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23370.6"
}
}