Skip to content

Commit

Permalink
[release/6.0-preview7] Update dependencies from dotnet/arcade (#56389)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20210726.4

Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , 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.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
 From Version 6.0.0-beta.21372.16 -> To Version 6.0.0-beta.21376.4

* Split mobile specific ILLink.Substitutions into its own file (#56306)

It was discovered in #56161 that mobile specific HttpClientHandler substitutions were sticking around even for non mobile builds. This change moves the substitution into ILLink.Substitutions.mobile.xml.

* Revert back to p4 SDK

* Revert "Split mobile specific ILLink.Substitutions into its own file (#56306)"

This reverts commit ae413d9.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Steve Pfister <[email protected]>
Co-authored-by: Matt Mitchell <[email protected]>
  • Loading branch information
4 people authored Jul 27, 2021
1 parent 45efb2f commit 501a7ef
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 54 deletions.
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,73 +14,73 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21372.16">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</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 @@ -198,9 +198,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e5511489deb44b13418fe622775bd7035e21c5ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21372.16">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21376.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
<Sha>e6abc186425e675e0f201acc1c33e183a0e51c86</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21364.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
28 changes: 14 additions & 14 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@
<MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21362.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21372.16</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21372.16</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21372.16</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21372.16</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21372.16</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21372.16</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksWorkloadsVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksWorkloadsVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21372.16</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21372.16</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21372.16</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21376.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21376.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21376.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21376.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21376.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21376.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21376.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21376.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21376.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21376.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksWorkloadsVersion>6.0.0-beta.21376.4</MicrosoftDotNetBuildTasksWorkloadsVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21376.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21376.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21376.4</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21372.16",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21376.4",
"Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21372.16",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21372.16",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21372.16",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21376.4",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21376.4",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21376.4",
"Microsoft.Build.NoTargets": "3.0.4",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21361.10"
Expand Down

0 comments on commit 501a7ef

Please sign in to comment.