tsai
/
tye
mirror of https://github.com/dotnet/tye.git
1
0
Fork 2
Code Issues Projects Releases Wiki Activity
Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20230628.2 

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild
 From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23328.2
pull/1598/head
dotnet-maestro[bot] 3 years ago
parent
d633189a0a
commit
b265b2b3df
5 changed files with 41 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      eng/Version.Details.xml
  2. 40
      eng/common/sdl/configure-sdl-tool.ps1
  3. 4
      eng/common/sdl/execute-all-sdl-tools.ps1
  4. 2
      eng/common/templates/steps/execute-sdl.yml
  5. 2
      global.json

20
eng/Version.Details.xml
View File

@ -3,25 +3,25 @@
<ProductDependencies> <ProductDependencies>
</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>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23327.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" 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.SignTool" Version="8.0.0-beta.23327.3"> <Dependency Name="Microsoft.DotNet.SignTool" 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.Helix.Sdk" Version="8.0.0-beta.23327.3"> <Dependency Name="Microsoft.DotNet.Helix.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.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23327.3"> <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" 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.Maestro.Client" Version="1.1.0-beta.19556.4"> <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>

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 }}

2
global.json
View File

@ -14,6 +14,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23327.3" "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23328.2"
} }
} }

Write Preview
Loading…
Cancel
Save