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

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

Browse source 
[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2023-06-29 16:56:58 +00:00 committed by GitHub
parent 76128a42f4
commit 061531a4c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 39 additions and 25 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> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23327.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23328.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7302feb026ccd0d7855023b58c6ab41e37d7e7c</Sha> <Sha>8ac0e1280f04bc897998a1f33bf6f27fe2146561</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23327.3"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23328.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7302feb026ccd0d7855023b58c6ab41e37d7e7c</Sha> <Sha>8ac0e1280f04bc897998a1f33bf6f27fe2146561</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23327.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23328.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e7302feb026ccd0d7855023b58c6ab41e37d7e7c</Sha> <Sha>8ac0e1280f04bc897998a1f33bf6f27fe2146561</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23307.2"> <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23307.2">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>

2
eng/Versions.props
View file

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

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

@ -17,7 +17,9 @@ Param(
# Optional: Additional params to add to any tool using PoliCheck. # Optional: Additional params to add to any tool using PoliCheck.
[string[]] $PoliCheckAdditionalRunConfigParams, [string[]] $PoliCheckAdditionalRunConfigParams,
# Optional: Additional params to add to any tool using CodeQL/Semmle. # Optional: Additional params to add to any tool using CodeQL/Semmle.
[string[]] $CodeQLAdditionalRunConfigParams [string[]] $CodeQLAdditionalRunConfigParams,
# Optional: Additional params to add to any tool using Binskim.
[string[]] $BinskimAdditionalRunConfigParams
) )
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
@ -69,22 +71,32 @@ try {
$gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig" $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig"
# For some tools, add default and automatic args. # For some tools, add default and automatic args.
if ($tool.Name -eq 'credscan') { switch -Exact ($tool.Name) {
if ($targetDirectory) { 'credscan' {
$tool.Args += "`"TargetDirectory < $TargetDirectory`"" if ($targetDirectory) {
$tool.Args += "`"TargetDirectory < $TargetDirectory`""
}
$tool.Args += "`"OutputType < pre`""
$tool.Args += $CrScanAdditionalRunConfigParams
} }
$tool.Args += "`"OutputType < pre`"" 'policheck' {
$tool.Args += $CrScanAdditionalRunConfigParams if ($targetDirectory) {
} elseif ($tool.Name -eq 'policheck') { $tool.Args += "`"Target < $TargetDirectory`""
if ($targetDirectory) { }
$tool.Args += "`"Target < $TargetDirectory`"" $tool.Args += $PoliCheckAdditionalRunConfigParams
} }
$tool.Args += $PoliCheckAdditionalRunConfigParams {$_ -in 'semmle', 'codeql'} {
} elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') { if ($targetDirectory) {
if ($targetDirectory) { $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`""
$tool.Args += "`"SourceCodeDirectory < $TargetDirectory`"" }
$tool.Args += $CodeQLAdditionalRunConfigParams
}
'binskim' {
if ($targetDirectory) {
$tool.Args += "`"Target < $TargetDirectory`""
}
$tool.Args += $BinskimAdditionalRunConfigParams
} }
$tool.Args += $CodeQLAdditionalRunConfigParams
} }
# Create variable pointing to the args array directly so we can use splat syntax later. # Create variable pointing to the args array directly so we can use splat syntax later.

4
eng/common/sdl/execute-all-sdl-tools.ps1
View file

@ -35,6 +35,7 @@ Param(
[string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1") [string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1")
[string[]] $PoliCheckAdditionalRunConfigParams, # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1") [string[]] $PoliCheckAdditionalRunConfigParams, # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1")
[string[]] $CodeQLAdditionalRunConfigParams, # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1") [string[]] $CodeQLAdditionalRunConfigParams, # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1")
[string[]] $BinskimAdditionalRunConfigParams, # Optional: Additional Params to custom build a Binskim run config in the format @("xyz < abc","sdf < 1")
[bool] $BreakOnFailure=$False # Optional: Fail the build if there were errors during the run [bool] $BreakOnFailure=$False # Optional: Fail the build if there were errors during the run
) )
@ -107,7 +108,8 @@ try {
-GuardianLoggerLevel $GuardianLoggerLevel ` -GuardianLoggerLevel $GuardianLoggerLevel `
-CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
-PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `
-CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams `
-BinskimAdditionalRunConfigParams $BinskimAdditionalRunConfigParams
if ($BreakOnFailure) { if ($BreakOnFailure) {
Exit-IfNZEC "Sdl" Exit-IfNZEC "Sdl"
} }

2
eng/common/templates/steps/execute-sdl.yml
View file

@ -33,7 +33,7 @@ steps:
- ${{ if ne(parameters.overrideParameters, '') }}: - ${{ if ne(parameters.overrideParameters, '') }}:
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
displayName: Execute SDL displayName: Execute SDL (Overridden)
continueOnError: ${{ parameters.sdlContinueOnError }} continueOnError: ${{ parameters.sdlContinueOnError }}
condition: ${{ parameters.condition }} condition: ${{ parameters.condition }}

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": "8.0.0-beta.23327.3", "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23328.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23327.3" "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23328.2"
} }
} }