From 185b0aef1b15fc93bcb80ab7aa22705af14dd85e Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Tue, 18 Jul 2023 15:26:31 +0200 Subject: [PATCH 1/3] Update Microsoft.DotNet.Arcade.Sdk to 8.0.0-beta.23364.2 --- eng/Version.Details.xml | 4 +- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 3810 -> 3842 bytes eng/common/sdl/configure-sdl-tool.ps1 | 40 ++++++++++++------- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 +- eng/common/templates/steps/execute-sdl.yml | 2 +- global.json | 6 ++- 6 files changed, 36 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eec4877c9ef..82637e07dbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ - + https://github.com/dotnet/arcade - 06d73ccc1f421af06c2794741a9913f474f66b3d + 60ea5b2eca5af06fc63b250f8669d2c70179b18c diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss index 6661fed566e49b0c206665bc21f135e06c9b89c4..858a0b237c62ce4f2ee12aa14794f160f6b122b7 100644 GIT binary patch delta 274 zcmaDP+a$;Ke*az|n#iQX$U9L_gN>JqL4iSGqQ3ORGAW?Q1Qjlb2!joS{zOAbi0B6! zCSI<|ip=VhLl{FCc_;TV>rD1wb_28WKvIp|l9MO!aluqwVe-JE3Mi$(QiGy^k2Qyp zcXJgh2O}fzByO?EbC~%yFJp^h0r5&8LVSE82)RSthrlX5CZFL2dIY2eC=as!FRvoZ VC5(KsFeZ}w7+K^&o(6kQ830GCL398B delta 289 zcmZpYdnC*B|KCJ59Y(H+iP97Oc_zkKO`NVWagPln*JOPr<;k*)5sCa-6G z0Wy(Sbn`m43>Gj`eDVTrmdU$#btcDi1KkdioE*R>0M!WMtz(ne{FHkKBZ~3}45bsf c6(=X~aZS$V(*VjreBsR}4-AfjvJ?He0GoYJrT_o{ diff --git a/eng/common/sdl/configure-sdl-tool.ps1 b/eng/common/sdl/configure-sdl-tool.ps1 index bdbf49e6c71..e4108e39d9a 100644 --- a/eng/common/sdl/configure-sdl-tool.ps1 +++ b/eng/common/sdl/configure-sdl-tool.ps1 @@ -17,7 +17,9 @@ Param( # Optional: Additional params to add to any tool using PoliCheck. [string[]] $PoliCheckAdditionalRunConfigParams, # 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' @@ -69,22 +71,32 @@ try { $gdnConfigFile = Join-Path $gdnConfigPath "$toolConfigName-configure.gdnconfig" # For some tools, add default and automatic args. - if ($tool.Name -eq 'credscan') { - if ($targetDirectory) { - $tool.Args += "`"TargetDirectory < $TargetDirectory`"" + switch -Exact ($tool.Name) { + 'credscan' { + if ($targetDirectory) { + $tool.Args += "`"TargetDirectory < $TargetDirectory`"" + } + $tool.Args += "`"OutputType < pre`"" + $tool.Args += $CrScanAdditionalRunConfigParams } - $tool.Args += "`"OutputType < pre`"" - $tool.Args += $CrScanAdditionalRunConfigParams - } elseif ($tool.Name -eq 'policheck') { - if ($targetDirectory) { - $tool.Args += "`"Target < $TargetDirectory`"" + 'policheck' { + if ($targetDirectory) { + $tool.Args += "`"Target < $TargetDirectory`"" + } + $tool.Args += $PoliCheckAdditionalRunConfigParams } - $tool.Args += $PoliCheckAdditionalRunConfigParams - } elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') { - if ($targetDirectory) { - $tool.Args += "`"SourceCodeDirectory < $TargetDirectory`"" + {$_ -in 'semmle', 'codeql'} { + if ($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. diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 4797e012c7d..4715d75e974 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -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[]] $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[]] $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 ) @@ -107,7 +108,8 @@ try { -GuardianLoggerLevel $GuardianLoggerLevel ` -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` - -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams + -CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams ` + -BinskimAdditionalRunConfigParams $BinskimAdditionalRunConfigParams if ($BreakOnFailure) { Exit-IfNZEC "Sdl" } diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 9dd5709f66d..07426fde05d 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -33,7 +33,7 @@ steps: - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL + displayName: Execute SDL (Overridden) continueOnError: ${{ parameters.sdlContinueOnError }} condition: ${{ parameters.condition }} diff --git a/global.json b/global.json index 1c91d872ed0..989eac25480 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,9 @@ "dotnet": "8.0.100-preview.6.23330.14", "vs": { "version": "17.6", - "components": ["Microsoft.VisualStudio.Component.FSharp"] + "components": [ + "Microsoft.VisualStudio.Component.FSharp" + ] }, "xcopy-msbuild": "17.6.0-2" }, @@ -16,7 +18,7 @@ "perl": "5.32.1.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23320.3", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From 6deee5c22cfa5c0c63d118ebc13077d6c69fd24a Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Wed, 19 Jul 2023 15:50:15 +0200 Subject: [PATCH 2/3] Change xliff tasks dependency name to adhere to strict coherency --- eng/Version.Details.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82637e07dbc..4d5ca62ac1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,11 +1,6 @@ - - https://github.com/dotnet/xliff-tasks - 4234ffac87e305da80597cb46dc0d4a87fc4f7c2 - - https://github.com/dotnet/source-build-reference-packages 2b54fbefe764f25c622a0c6b7376bcf561d156cf @@ -44,5 +39,10 @@ 4d2c8bf58e8cb7900ec2d9077c155572e2d3cd88 + + https://github.com/dotnet/xliff-tasks + 4234ffac87e305da80597cb46dc0d4a87fc4f7c2 + + From e00228bc9e11dab080a042d8b1d20ea9fca16c9f Mon Sep 17 00:00:00 2001 From: MilenaHristova Date: Wed, 19 Jul 2023 15:51:17 +0200 Subject: [PATCH 3/3] update dependencies --- eng/Version.Details.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d5ca62ac1b..535284f7ab2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/source-build-reference-packages - 2b54fbefe764f25c622a0c6b7376bcf561d156cf + 529fbc2aad419d0c1551d6685cc68be33e62a996 @@ -34,14 +34,14 @@ 60ea5b2eca5af06fc63b250f8669d2c70179b18c - + https://github.com/dotnet/sourcelink - 4d2c8bf58e8cb7900ec2d9077c155572e2d3cd88 + d2e046aec870a5a7601cc51c5607f34463cc2d42 - + https://github.com/dotnet/xliff-tasks - 4234ffac87e305da80597cb46dc0d4a87fc4f7c2 + a171b61473272e5a6d272117963864ba958a012a