Skip to content

Commit 1f9b0c7

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20230630.1 (#367)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 60a73f9 commit 1f9b0c7

File tree

6 files changed

+48
-34
lines changed

6 files changed

+48
-34
lines changed

‎eng/Version.Details.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23322.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23330.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>9747cf5ac4abb6a5a13cf31fa78b91d599180e07</Sha>
8+
<Sha>9fc23a576f443284d25cd4311f5778158ad289c9</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23322.2">
11+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23330.1">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>9747cf5ac4abb6a5a13cf31fa78b91d599180e07</Sha>
13+
<Sha>9fc23a576f443284d25cd4311f5778158ad289c9</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23322.2">
15+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23330.1">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>9747cf5ac4abb6a5a13cf31fa78b91d599180e07</Sha>
17+
<Sha>9fc23a576f443284d25cd4311f5778158ad289c9</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23322.2">
19+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23330.1">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>9747cf5ac4abb6a5a13cf31fa78b91d599180e07</Sha>
21+
<Sha>9fc23a576f443284d25cd4311f5778158ad289c9</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23322.2">
23+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23330.1">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>9747cf5ac4abb6a5a13cf31fa78b91d599180e07</Sha>
25+
<Sha>9fc23a576f443284d25cd4311f5778158ad289c9</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23322.2">
27+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23330.1">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>9747cf5ac4abb6a5a13cf31fa78b91d599180e07</Sha>
29+
<Sha>9fc23a576f443284d25cd4311f5778158ad289c9</Sha>
3030
</Dependency>
3131
</ToolsetDependencies>
3232
</Dependencies>

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1818
</PropertyGroup>
1919
<PropertyGroup>
20-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23322.2</MicrosoftDotNetBuildTasksPackagingVersion>
21-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23322.2</MicrosoftDotNetBuildTasksTemplatingVersion>
22-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23322.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
23-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23322.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
20+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23330.1</MicrosoftDotNetBuildTasksPackagingVersion>
21+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23330.1</MicrosoftDotNetBuildTasksTemplatingVersion>
22+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23330.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
23+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23330.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
2626
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

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

+26-14
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ Param(
1717
# Optional: Additional params to add to any tool using PoliCheck.
1818
[string[]] $PoliCheckAdditionalRunConfigParams,
1919
# Optional: Additional params to add to any tool using CodeQL/Semmle.
20-
[string[]] $CodeQLAdditionalRunConfigParams
20+
[string[]] $CodeQLAdditionalRunConfigParams,
21+
# Optional: Additional params to add to any tool using Binskim.
22+
[string[]] $BinskimAdditionalRunConfigParams
2123
)
2224

2325
$ErrorActionPreference = 'Stop'
@@ -69,22 +71,32 @@ try {
6971
$gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig"
7072

7173
# For some tools, add default and automatic args.
72-
if ($tool.Name -eq 'credscan') {
73-
if ($targetDirectory) {
74-
$tool.Args += "`"TargetDirectory < $TargetDirectory`""
74+
switch -Exact ($tool.Name) {
75+
'credscan' {
76+
if ($targetDirectory) {
77+
$tool.Args += "`"TargetDirectory < $TargetDirectory`""
78+
}
79+
$tool.Args += "`"OutputType < pre`""
80+
$tool.Args += $CrScanAdditionalRunConfigParams
7581
}
76-
$tool.Args += "`"OutputType < pre`""
77-
$tool.Args += $CrScanAdditionalRunConfigParams
78-
} elseif ($tool.Name -eq 'policheck') {
79-
if ($targetDirectory) {
80-
$tool.Args += "`"Target < $TargetDirectory`""
82+
'policheck' {
83+
if ($targetDirectory) {
84+
$tool.Args += "`"Target < $TargetDirectory`""
85+
}
86+
$tool.Args += $PoliCheckAdditionalRunConfigParams
8187
}
82-
$tool.Args += $PoliCheckAdditionalRunConfigParams
83-
} elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') {
84-
if ($targetDirectory) {
85-
$tool.Args += "`"SourceCodeDirectory < $TargetDirectory`""
88+
{$_ -in 'semmle', 'codeql'} {
89+
if ($targetDirectory) {
90+
$tool.Args += "`"SourceCodeDirectory < $TargetDirectory`""
91+
}
92+
$tool.Args += $CodeQLAdditionalRunConfigParams
93+
}
94+
'binskim' {
95+
if ($targetDirectory) {
96+
$tool.Args += "`"Target < $TargetDirectory`""
97+
}
98+
$tool.Args += $BinskimAdditionalRunConfigParams
8699
}
87-
$tool.Args += $CodeQLAdditionalRunConfigParams
88100
}
89101

90102
# Create variable pointing to the args array directly so we can use splat syntax later.

‎eng/common/sdl/execute-all-sdl-tools.ps1

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Param(
3535
[string[]] $CrScanAdditionalRunConfigParams, # Optional: Additional Params to custom build a CredScan run config in the format @("xyz:abc","sdf:1")
3636
[string[]] $PoliCheckAdditionalRunConfigParams, # Optional: Additional Params to custom build a Policheck run config in the format @("xyz:abc","sdf:1")
3737
[string[]] $CodeQLAdditionalRunConfigParams, # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1")
38+
[string[]] $BinskimAdditionalRunConfigParams, # Optional: Additional Params to custom build a Binskim run config in the format @("xyz < abc","sdf < 1")
3839
[bool] $BreakOnFailure=$False # Optional: Fail the build if there were errors during the run
3940
)
4041

@@ -107,7 +108,8 @@ try {
107108
-GuardianLoggerLevel $GuardianLoggerLevel `
108109
-CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
109110
-PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `
110-
-CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams
111+
-CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams `
112+
-BinskimAdditionalRunConfigParams $BinskimAdditionalRunConfigParams
111113
if ($BreakOnFailure) {
112114
Exit-IfNZEC "Sdl"
113115
}

‎eng/common/templates/steps/execute-sdl.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ steps:
3333
3434
- ${{ if ne(parameters.overrideParameters, '') }}:
3535
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
36-
displayName: Execute SDL
36+
displayName: Execute SDL (Overridden)
3737
continueOnError: ${{ parameters.sdlContinueOnError }}
3838
condition: ${{ parameters.condition }}
3939

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "8.0.100-preview.5.23303.2"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23322.2",
7-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23322.2"
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23330.1",
7+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23330.1"
88
}
99
}

0 commit comments

Comments
 (0)