Skip to content

[main] Update dependencies from dotnet/arcade #72178

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
agocke merged 7 commits into from
Jul 21, 2022
Merged

[main] Update dependencies from dotnet/arcade #72178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5fe07e0
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 14, 2022
944e973
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 15, 2022
9d2362e
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 16, 2022
b4e917c
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 18, 2022
022440e
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 19, 2022
357f5dc
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 20, 2022
9428083
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jul 21, 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
Prev Previous commit
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20220… 
…719.9

Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 7.0.0-beta.22362.1 -> To Version 7.0.0-beta.22369.9
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed Jul 20, 2022
commit 357f5dcae276101313d8d07bce993a0d8d22132e
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 @@ -54,77 +54,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22368.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</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 @@ -254,9 +254,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>7871eb473366b7246d628ba30bfc70dd84f8dbb9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22368.5">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22369.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6bf3e1d9cd29fe839be38a4c051aa307cf96f5d0</Sha>
<Sha>cda764613f89280de6d5c5383ebded9ac01ebd00</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22355.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>2.0.0-preview.4.22252.4</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22368.5</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22368.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22368.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22368.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22368.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22368.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22368.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22368.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22368.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22368.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22368.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22368.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22368.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22368.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22368.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22368.5</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22369.9</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22369.9</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22369.9</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22369.9</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22369.9</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22369.9</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22369.9</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22369.9</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22369.9</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22369.9</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22369.9</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22369.9</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22369.9</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22369.9</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22369.9</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22369.9</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
2 changes: 2 additions & 0 deletions eng/common/generate-sbom-prep.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ Param(
[Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed
)

. $PSScriptRoot\pipeline-logging-functions.ps1

Write-Host "Creating dir $ManifestDirPath"
# create directory for sbom manifest to be placed
if (!(Test-Path -path $ManifestDirPath))
Expand Down
12 changes: 12 additions & 0 deletions eng/common/generate-sbom-prep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

source="${BASH_SOURCE[0]}"

# resolve $SOURCE until the file is no longer a symlink
while [[ -h $source ]]; do
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
source="$(readlink "$source")"

# if $source was a relative symlink, we need to resolve it relative to the path where the
# symlink file was located
[[ $source != /* ]] && source="$scriptroot/$source"
done
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
. $scriptroot/pipeline-logging-functions.sh

manifest_dir=$1

if [ ! -d "$manifest_dir" ] ; then
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "7.0.100-preview.5.22307.18"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22368.5",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22368.5",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22368.5",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22369.9",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22369.9",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22369.9",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-preview.7.22358.7"
Expand Down