Skip to content

[release/6.0] Update dependencies from dotnet/arcade #64749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
safern merged 2 commits into from
Feb 8, 2022
Merged

[release/6.0] Update dependencies from dotnet/arcade #64749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
605ff2c
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Feb 3, 2022
e954b88
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,77 +18,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21614.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -210,9 +210,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21614.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22104.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>47f8ea1d7ef3efd5d4fa93ccb79ccccf4182095e</Sha>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21614.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21614.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21614.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21614.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21614.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21614.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21614.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21614.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21614.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21614.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22104.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22104.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22104.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22104.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22104.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22104.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22104.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22104.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22104.4</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
86 changes: 0 additions & 86 deletions eng/common/generate-graph-files.ps1
View file
Open in desktop

This file was deleted.

28 changes: 1 addition & 27 deletions eng/common/post-build/publish-using-darc.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@ param(
[Parameter(Mandatory=$true)][string] $MaestroToken,
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
[Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation,
[Parameter(Mandatory=$false)][string] $EnableSigningValidation,
[Parameter(Mandatory=$false)][string] $EnableNugetValidation,
[Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
[Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
)

try {
Expand All @@ -35,27 +30,6 @@ try {
$optionalParams.Add("--no-wait") | Out-Null
}

if ("false" -ne $PublishInstallersAndChecksums) {
$optionalParams.Add("--publish-installers-and-checksums") | Out-Null
}

if ("true" -eq $EnableNugetValidation) {
$optionalParams.Add("--validate-nuget") | Out-Null
}

if ("true" -eq $EnableSourceLinkValidation) {
$optionalParams.Add("--validate-sourcelinkchecksums") | Out-Null
}

if ("true" -eq $EnableSigningValidation) {
$optionalParams.Add("--validate-signingchecksums") | Out-Null

if ("" -ne $SigningValidationAdditionalParameters) {
$optionalParams.Add("--signing-validation-parameters") | Out-Null
$optionalParams.Add($SigningValidationAdditionalParameters) | Out-Null
}
}

& $darc add-build-to-channel `
--id $buildId `
--publishing-infra-version $PublishingInfraVersion `
Expand Down
9 changes: 8 additions & 1 deletion eng/common/sdl/configure-sdl-tool.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ Param(
# Optional: Additional params to add to any tool using CredScan.
[string[]] $CrScanAdditionalRunConfigParams,
# 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.
[string[]] $CodeQLAdditionalRunConfigParams
)

$ErrorActionPreference = 'Stop'
Expand Down Expand Up @@ -78,6 +80,11 @@ try {
$tool.Args += "Target < $TargetDirectory"
}
$tool.Args += $PoliCheckAdditionalRunConfigParams
} elseif ($tool.Name -eq 'semmle' -or $tool.Name -eq 'codeql') {
if ($targetDirectory) {
$tool.Args += "`"SourceCodeDirectory < $TargetDirectory`""
}
$tool.Args += $CodeQLAdditionalRunConfigParams
}

# Create variable pointing to the args array directly so we can use splat syntax later.
Expand Down
4 changes: 3 additions & 1 deletion eng/common/sdl/execute-all-sdl-tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Param(
[string] $GuardianLoggerLevel='Standard', # Optional: the logger level for the Guardian CLI; options are Trace, Verbose, Standard, Warning, and Error
[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")
[bool] $BreakOnFailure=$False # Optional: Fail the build if there were errors during the run
)

Expand Down Expand Up @@ -105,7 +106,8 @@ try {
-AzureDevOpsAccessToken $AzureDevOpsAccessToken `
-GuardianLoggerLevel $GuardianLoggerLevel `
-CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
-PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
-PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `
-CodeQLAdditionalRunConfigParams $CodeQLAdditionalRunConfigParams
if ($BreakOnFailure) {
Exit-IfNZEC "Sdl"
}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdl/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Guardian.Cli" version="0.53.3"/>
<package id="Microsoft.Guardian.Cli" version="0.110.1"/>
</packages>
Loading