Skip to content

Commit 605ff2c

Browse files
dotnet-maestro[bot]safern
dotnet-maestro[bot]
authored and
safern
committed
Update dependencies from https://github.com/dotnet/arcade build 20220202.3
Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.21614.2 -> To Version 2.5.1-beta.22102.3
1 parent 50b230e commit 605ff2c

21 files changed

Lines changed: 391 additions & 1246 deletions

‎eng/Version.Details.xml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,77 +18,77 @@
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21614.2">
21+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22102.3">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
23+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21614.2">
25+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22102.3">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
27+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21614.2">
29+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22102.3">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
31+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21614.2">
33+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22102.3">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
35+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21614.2">
37+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22102.3">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
39+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21614.2">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22102.3">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
43+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21614.2">
45+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22102.3">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
47+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21614.2">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22102.3">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
51+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21614.2">
53+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22102.3">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
55+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21614.2">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22102.3">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
59+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21614.2">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22102.3">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
63+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21614.2">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22102.3">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
67+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21614.2">
69+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22102.3">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
71+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21614.2">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22102.3">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
75+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21614.2">
77+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22102.3">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
79+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21614.2">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22102.3">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
83+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21614.2">
85+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22102.3">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
87+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21614.2">
89+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22102.3">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
91+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
9292
</Dependency>
9393
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
9494
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -210,9 +210,9 @@
210210
<Uri>https://github.com/dotnet/xharness</Uri>
211211
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
212212
</Dependency>
213-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21614.2">
213+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22102.3">
214214
<Uri>https://github.com/dotnet/arcade</Uri>
215-
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
215+
<Sha>93e08e378eb00a4267ffeca24b6bebb4f6c011ef</Sha>
216216
</Dependency>
217217
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
218218
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@
3737
<!-- SDK dependencies -->
3838
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
3939
<!-- Arcade dependencies -->
40-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21614.2</MicrosoftDotNetApiCompatVersion>
41-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksFeedVersion>
42-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21614.2</MicrosoftDotNetCodeAnalysisVersion>
43-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21614.2</MicrosoftDotNetGenAPIVersion>
44-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21614.2</MicrosoftDotNetGenFacadesVersion>
45-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21614.2</MicrosoftDotNetXUnitExtensionsVersion>
46-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21614.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
47-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksArchivesVersion>
48-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksInstallersVersion>
49-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksPackagingVersion>
50-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksTemplatingVersion>
51-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
52-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21614.2</MicrosoftDotNetRemoteExecutorVersion>
53-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21614.2</MicrosoftDotNetVersionToolsTasksVersion>
54-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21614.2</MicrosoftDotNetPackageTestingVersion>
40+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22102.3</MicrosoftDotNetApiCompatVersion>
41+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22102.3</MicrosoftDotNetBuildTasksFeedVersion>
42+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22102.3</MicrosoftDotNetCodeAnalysisVersion>
43+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22102.3</MicrosoftDotNetGenAPIVersion>
44+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22102.3</MicrosoftDotNetGenFacadesVersion>
45+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22102.3</MicrosoftDotNetXUnitExtensionsVersion>
46+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22102.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
47+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22102.3</MicrosoftDotNetBuildTasksArchivesVersion>
48+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22102.3</MicrosoftDotNetBuildTasksInstallersVersion>
49+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22102.3</MicrosoftDotNetBuildTasksPackagingVersion>
50+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22102.3</MicrosoftDotNetBuildTasksTemplatingVersion>
51+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22102.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
52+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22102.3</MicrosoftDotNetRemoteExecutorVersion>
53+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22102.3</MicrosoftDotNetVersionToolsTasksVersion>
54+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22102.3</MicrosoftDotNetPackageTestingVersion>
5555
<!-- NuGet dependencies -->
5656
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
5757
<!-- Installer dependencies -->

‎eng/common/generate-graph-files.ps1‎

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎eng/common/post-build/publish-using-darc.ps1‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@ param(
55
[Parameter(Mandatory=$true)][string] $MaestroToken,
66
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
77
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
8-
[Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
9-
[Parameter(Mandatory=$false)][string] $EnableSigningValidation,
10-
[Parameter(Mandatory=$false)][string] $EnableNugetValidation,
11-
[Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
128
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
13-
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
14-
[Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
9+
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
1510
)
1611

1712
try {
@@ -35,27 +30,6 @@ try {
3530
$optionalParams.Add("--no-wait") | Out-Null
3631
}
3732

38-
if ("false" -ne $PublishInstallersAndChecksums) {
39-
$optionalParams.Add("--publish-installers-and-checksums") | Out-Null
40-
}
41-
42-
if ("true" -eq $EnableNugetValidation) {
43-
$optionalParams.Add("--validate-nuget") | Out-Null
44-
}
45-
46-
if ("true" -eq $EnableSourceLinkValidation) {
47-
$optionalParams.Add("--validate-sourcelinkchecksums") | Out-Null
48-
}
49-
50-
if ("true" -eq $EnableSigningValidation) {
51-
$optionalParams.Add("--validate-signingchecksums") | Out-Null
52-
53-
if ("" -ne $SigningValidationAdditionalParameters) {
54-
$optionalParams.Add("--signing-validation-parameters") | Out-Null
55-
$optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null
56-
}
57-
}
58-
5933
& $darc add-build-to-channel `
6034
--id $buildId `
6135
--publishing-infra-version $PublishingInfraVersion `

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ Param(
1515
# Optional: Additional params to add to any tool using CredScan.
1616
[string[]] $CrScanAdditionalRunConfigParams,
1717
# Optional: Additional params to add to any tool using PoliCheck.
18-
[string[]] $PoliCheckAdditionalRunConfigParams
18+
[string[]] $PoliCheckAdditionalRunConfigParams,
19+
# Optional: Additional params to add to any tool using CodeQL/Semmle.
20+
[string[]] $CodeQLAdditionalRunConfigParams
1921
)
2022

2123
$ErrorActionPreference = 'Stop'
@@ -78,6 +80,11 @@ try {
7880
$tool.Args += "Target < $TargetDirectory"
7981
}
8082
$tool.Args += $PoliCheckAdditionalRunConfigParams
83+
} elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') {
84+
if ($targetDirectory) {
85+
$tool.Args += "`"SourceCodeDirectory < $TargetDirectory`""
86+
}
87+
$tool.Args += $CodeQLAdditionalRunConfigParams
8188
}
8289

8390
# 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
@@ -34,6 +34,7 @@ Param(
3434
[string] $GuardianLoggerLevel='Standard', # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
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")
37+
[string[]] $CodeQLAdditionalRunConfigParams, # Optional: Additional Params to custom build a Semmle/CodeQL run config in the format @("xyz < abc","sdf < 1")
3738
[bool] $BreakOnFailure=$False # Optional: Fail the build if there were errors during the run
3839
)
3940

@@ -105,7 +106,8 @@ try {
105106
-AzureDevOpsAccessToken $AzureDevOpsAccessToken `
106107
-GuardianLoggerLevel $GuardianLoggerLevel `
107108
-CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
108-
-PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
109+
-PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `
110+
-CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams
109111
if ($BreakOnFailure) {
110112
Exit-IfNZEC "Sdl"
111113
}

‎eng/common/sdl/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.53.3"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.110.1"/>
44
</packages>

0 commit comments

Comments
 (0)