Skip to content

[release/6.0-preview7] Update dependencies from dotnet/arcade #56255

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
merged 4 commits into from
Jul 26, 2021
Merged

[release/6.0-preview7] Update dependencies from dotnet/arcade #56255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea032fa
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 23, 2021
a847376
Revert .NET SDK version.
mmitche Jul 23, 2021
accafed
Prepare for arcade changes that enable testing of meta-packages (#55976)
ericstj Jul 20, 2021
8ebb92e
Fix package testing
ericstj Jul 21, 2021
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
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
View file
Open in desktop
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.21364.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21364.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21369.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e97027cf100d2b532adce387e5cb93a373de93c9</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21364.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</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.21364.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21372.16">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</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
View file
Open in desktop
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.21364.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21364.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21364.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21364.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21364.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21364.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21364.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21364.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21364.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21369.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksWorkloadsVersion>6.0.0-beta.21369.3</MicrosoftDotNetBuildTasksWorkloadsVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21364.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21364.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21364.3</MicrosoftDotNetPackageTestingVersion>
<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>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ steps:
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
fi

internalRuntimeDownloadArgs=
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
fi

targetRidArgs=
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
Expand All @@ -43,6 +48,7 @@ steps:
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
$officialBuildArgs \
$internalRuntimeDownloadArgs \
$targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
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.21364.3",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21372.16",
"Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21364.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21364.3",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21364.3",
"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.Build.NoTargets": "3.0.4",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21361.10"
Expand Down
14 changes: 2 additions & 12 deletions src/libraries/pkg/test/build/packageTest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,6 @@
<RuntimeLibToTest Condition="'%(RuntimeLibToTest.RuntimeIdentifier)' == ''" RuntimeIdentifier="none" />
</ItemGroup>

<!-- These libraries are part of the runtime pack but aren't exposed in the targeting pack: https://github.com/dotnet/runtime/issues/53892 -->
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
<ReferenceLibToTest Remove="@(ReferenceLibToTest)"
Condition="'$(TestPackageId)' == 'Microsoft.Win32.Registry' or
'$(TestPackageId)' == 'System.IO.FileSystem.AccessControl' or
'$(TestPackageId)' == 'System.IO.Pipes.AccessControl' or
'$(TestPackageId)' == 'System.Security.AccessControl' or
'$(TestPackageId)' == 'System.Security.Principal.Windows'" />
</ItemGroup>

<ItemGroup>
<RuntimeLibToTestDependency Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)' != '$(TestPackageId)'" />

Expand All @@ -104,7 +94,7 @@
Inputs="%(RuntimeLibToTest.RuntimeIdentifier)"
Outputs="unused"
DependsOnTargets="PrepareForRuntimeTesting"
Condition="'$(ShouldVerifyClosure)' == 'true' and '$(SkipVerifyClosureForRuntime)' != 'true'">
Condition="'$(ShouldVerifyClosure)' == 'true' and '$(SkipVerifyClosureForRuntime)' != 'true' and '$(SkipVerifyRuntime)' != 'true'">
<Message Importance="High" Text="Testing closure for $(TestPackageID) TFM=$(TargetFramework) RID=%(RuntimeLibToTest.RuntimeIdentifier)" />
<ItemGroup>
<_runClosureFileNames Include="@(RuntimeLibToTestDependency->'%(FileName)');@(RuntimeLibToTest->'%(FileName)')">
Expand All @@ -123,7 +113,7 @@
Inputs="%(RuntimeLibToTest.RuntimeIdentifier)"
Outputs="unused"
DependsOnTargets="PrepareForRuntimeTesting"
Condition="'$(ShouldVerifyTypes)' == 'true'">
Condition="'$(ShouldVerifyTypes)' == 'true' and '$(SkipVerifyRuntime)' != 'true'">
<Message Importance="High" Text="Testing for duplicate types for $(TestPackageID) TFM=$(TargetFramework) RID=%(RuntimeLibToTest.RuntimeIdentifier)" />
<ItemGroup>
<_runTypesFileNames Include="@(RuntimeLibToTestDependency->'%(FileName)');@(RuntimeLibToTest->'%(FileName)')">
Expand Down
17 changes: 17 additions & 0 deletions .../pkg/test/packageSettings/Microsoft.Windows.Compatibility/netstandard2.1/settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<ItemGroup>
<!-- https://github.com/dotnet/standard/issues/1622 -->
<IgnoredTypes Include="System.Data.DataRowComparer" />
<IgnoredTypes Include="System.Data.DataRowComparer`1" />
<IgnoredTypes Include="System.Data.DataRowExtensions" />
<IgnoredTypes Include="System.Data.DataTableExtensions" />
<IgnoredTypes Include="System.Data.EnumerableRowCollection" />
<IgnoredTypes Include="System.Data.EnumerableRowCollectionExtensions" />
<IgnoredTypes Include="System.Data.EnumerableRowCollection`1" />
<IgnoredTypes Include="System.Data.OrderedEnumerableRowCollection`1" />
<IgnoredTypes Include="System.Data.TypedTableBaseExtensions" />
<IgnoredTypes Include="System.Data.TypedTableBase`1" />
<!-- https://github.com/dotnet/standard/issues/1791 -->
<IgnoredTypes Include="System.Reflection.DispatchProxy" />
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions ...ries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/workaroundDowngrade.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project>
<ItemGroup>
<!-- We cannot reference the current build of runtime.native.System.IO.Ports because its built across multiple machines -->
<PackageReference Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" Include="runtime.native.System.IO.Ports" Version="$(runtimenativeSystemIOPortsVersion)" NoWarn="NU1605" />
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions src/libraries/pkg/test/packageSettings/System.Runtime.Experimental/settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<SkipVerifyRuntime>true</SkipVerifyRuntime>
</PropertyGroup>
</Project>
2 changes: 2 additions & 0 deletions src/libraries/pkg/test/testPackages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
</AllPackagesFilePath>
<AllPackages Include="@(AllPackagesFilePath->'%(PackageName)')" />

<!-- runtime.native.System.IO.Ports requires all runtime legs to be built in order to test -->
<ExcludePackages Include="runtime.native.System.IO.Ports" />
<ExcludePackages Condition="'$(PackagesToTest)' != ''" Include="@(AllPackages)" Exclude="@(PackagesToTest)" />
<TestPackages Include="@(AllPackages)" Exclude="@(ExcludePackages)" />
<TestPackagesPath Include="@(TestPackages->'%(PackagePath)')" />
Expand Down