Skip to content

Commit 67dd8f6

Browse files
MilenaHristovaMilenaHristova
authored
Update Microsoft.DotNet.Arcade.Sdk to 8.0.0-beta.23364.2 (#15616)
1 parent e3c64a4 commit 67dd8f6

6 files changed

Lines changed: 45 additions & 29 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.23312.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
5-
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
6-
<Sha>4234ffac87e305da80597cb46dc0d4a87fc4f7c2</Sha>
7-
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
8-
</Dependency>
9-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23362.3">
4+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23368.2">
105
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
11-
<Sha>2b54fbefe764f25c622a0c6b7376bcf561d156cf</Sha>
6+
<Sha>529fbc2aad419d0c1551d6685cc68be33e62a996</Sha>
127
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
138
</Dependency>
149
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.7.0-preview-23217-02">
@@ -34,15 +29,20 @@
3429
</Dependency>
3530
</ProductDependencies>
3631
<ToolsetDependencies>
37-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23320.3">
32+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23364.2">
3833
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>06d73ccc1f421af06c2794741a9913f474f66b3d</Sha>
34+
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
4035
<SourceBuild RepoName="arcade" ManagedOnly="true" />
4136
</Dependency>
42-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23314.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
37+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23361.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
4338
<Uri>https://github.com/dotnet/sourcelink</Uri>
44-
<Sha>4d2c8bf58e8cb7900ec2d9077c155572e2d3cd88</Sha>
39+
<Sha>d2e046aec870a5a7601cc51c5607f34463cc2d42</Sha>
4540
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
4641
</Dependency>
42+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23360.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
43+
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
44+
<Sha>a171b61473272e5a6d272117963864ba958a012a</Sha>
45+
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
46+
</Dependency>
4747
</ToolsetDependencies>
4848
</Dependencies>

‎eng/common/loc/P22DotNetHtmlLocalization.lss‎

32 Bytes
Binary file not shown.

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

Lines changed: 26 additions & 14 deletions
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‎

Lines changed: 3 additions & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@
88
"dotnet": "8.0.100-preview.6.23330.14",
99
"vs": {
1010
"version": "17.6",
11-
"components": ["Microsoft.VisualStudio.Component.FSharp"]
11+
"components": [
12+
"Microsoft.VisualStudio.Component.FSharp"
13+
]
1214
},
1315
"xcopy-msbuild": "17.6.0-2"
1416
},
1517
"native-tools": {
1618
"perl": "5.32.1.1"
1719
},
1820
"msbuild-sdks": {
19-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23320.3",
21+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2",
2022
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2123
}
2224
}

0 commit comments

Comments
 (0)