Skip to content

Commit bc84c7a

Browse files
dotnet-maestro[bot]mmitcheericstj
authored
[release/6.0-preview7] Update dependencies from dotnet/arcade (#56255)
* Update dependencies from https://github.com/dotnet/arcade build 20210722.16 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.21364.3 -> To Version 6.0.0-beta.21372.16 * Revert .NET SDK version. * Prepare for arcade changes that enable testing of meta-packages (#55976) * Fix package testing Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Mitchell <[email protected]> Co-authored-by: Eric StJohn <[email protected]>
1 parent 78c0cb4 commit bc84c7a

9 files changed

Lines changed: 92 additions & 66 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,73 +14,73 @@
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>
17-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21364.3">
17+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21372.16">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
19+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21364.3">
21+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21372.16">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
23+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21364.3">
25+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21372.16">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
27+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21364.3">
29+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21372.16">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
31+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21364.3">
33+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21372.16">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
35+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21364.3">
37+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21372.16">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
39+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21364.3">
41+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21372.16">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
43+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21364.3">
45+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21372.16">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
47+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21364.3">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21372.16">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
51+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21364.3">
53+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21372.16">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
55+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21364.3">
57+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21372.16">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
59+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21369.3">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21372.16">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>e97027cf100d2b532adce387e5cb93a373de93c9</Sha>
63+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21364.3">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21372.16">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
67+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21364.3">
69+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21372.16">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
71+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21364.3">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21372.16">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
75+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21364.3">
77+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21372.16">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
79+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21364.3">
81+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21372.16">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
83+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
8484
</Dependency>
8585
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
8686
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -198,9 +198,9 @@
198198
<Uri>https://github.com/dotnet/xharness</Uri>
199199
<Sha>e5511489deb44b13418fe622775bd7035e21c5ae</Sha>
200200
</Dependency>
201-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21364.3">
201+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21372.16">
202202
<Uri>https://github.com/dotnet/arcade</Uri>
203-
<Sha>6a8491b61e0c243cbb6a7ff4966b48e6d1e075b1</Sha>
203+
<Sha>6224d1b573b73caaa84176bd83dabe75f202cdc7</Sha>
204204
</Dependency>
205205
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21364.4">
206206
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@
5252
<MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion>
5353
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21362.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
5454
<!-- Arcade dependencies -->
55-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21364.3</MicrosoftDotNetApiCompatVersion>
56-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21364.3</MicrosoftDotNetBuildTasksFeedVersion>
57-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21364.3</MicrosoftDotNetCodeAnalysisVersion>
58-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21364.3</MicrosoftDotNetGenAPIVersion>
59-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21364.3</MicrosoftDotNetGenFacadesVersion>
60-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21364.3</MicrosoftDotNetXUnitExtensionsVersion>
61-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21364.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
62-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21364.3</MicrosoftDotNetBuildTasksArchivesVersion>
63-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21364.3</MicrosoftDotNetBuildTasksInstallersVersion>
64-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21369.3</MicrosoftDotNetBuildTasksPackagingVersion>
65-
<MicrosoftDotNetBuildTasksWorkloadsVersion>6.0.0-beta.21369.3</MicrosoftDotNetBuildTasksWorkloadsVersion>
66-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21364.3</MicrosoftDotNetRemoteExecutorVersion>
67-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21364.3</MicrosoftDotNetVersionToolsTasksVersion>
68-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21364.3</MicrosoftDotNetPackageTestingVersion>
55+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21372.16</MicrosoftDotNetApiCompatVersion>
56+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksFeedVersion>
57+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21372.16</MicrosoftDotNetCodeAnalysisVersion>
58+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21372.16</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21372.16</MicrosoftDotNetGenFacadesVersion>
60+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21372.16</MicrosoftDotNetXUnitExtensionsVersion>
61+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21372.16</MicrosoftDotNetXUnitConsoleRunnerVersion>
62+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksArchivesVersion>
63+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksInstallersVersion>
64+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksPackagingVersion>
65+
<MicrosoftDotNetBuildTasksWorkloadsVersion>6.0.0-beta.21372.16</MicrosoftDotNetBuildTasksWorkloadsVersion>
66+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21372.16</MicrosoftDotNetRemoteExecutorVersion>
67+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21372.16</MicrosoftDotNetVersionToolsTasksVersion>
68+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21372.16</MicrosoftDotNetPackageTestingVersion>
6969
<!-- NuGet dependencies -->
7070
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7171
<!-- Installer dependencies -->

‎eng/common/templates/steps/source-build.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ steps:
2929
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
3030
fi
3131
32+
internalRuntimeDownloadArgs=
33+
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
34+
internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
35+
fi
36+
3237
targetRidArgs=
3338
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
3439
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
@@ -43,6 +48,7 @@ steps:
4348
--configuration $buildConfig \
4449
--restore --build --pack $publishArgs -bl \
4550
$officialBuildArgs \
51+
$internalRuntimeDownloadArgs \
4652
$targetRidArgs \
4753
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
4854
/p:ArcadeBuildFromSource=true

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21364.3",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21372.16",
1616
"Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4",
17-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21364.3",
18-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21364.3",
19-
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21364.3",
17+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21372.16",
18+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21372.16",
19+
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21372.16",
2020
"Microsoft.Build.NoTargets": "3.0.4",
2121
"Microsoft.Build.Traversal": "3.0.23",
2222
"Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21361.10"

‎src/libraries/pkg/test/build/packageTest.targets‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,6 @@
7474
<RuntimeLibToTest Condition="'%(RuntimeLibToTest.RuntimeIdentifier)' == ''" RuntimeIdentifier="none" />
7575
</ItemGroup>
7676

77-
<!-- These libraries are part of the runtime pack but aren't exposed in the targeting pack: https://github.com/dotnet/runtime/issues/53892 -->
78-
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
79-
<ReferenceLibToTest Remove="@(ReferenceLibToTest)"
80-
Condition="'$(TestPackageId)' == 'Microsoft.Win32.Registry' or
81-
'$(TestPackageId)' == 'System.IO.FileSystem.AccessControl' or
82-
'$(TestPackageId)' == 'System.IO.Pipes.AccessControl' or
83-
'$(TestPackageId)' == 'System.Security.AccessControl' or
84-
'$(TestPackageId)' == 'System.Security.Principal.Windows'" />
85-
</ItemGroup>
86-
8777
<ItemGroup>
8878
<RuntimeLibToTestDependency Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)' != '$(TestPackageId)'" />
8979

@@ -104,7 +94,7 @@
10494
Inputs="%(RuntimeLibToTest.RuntimeIdentifier)"
10595
Outputs="unused"
10696
DependsOnTargets="PrepareForRuntimeTesting"
107-
Condition="'$(ShouldVerifyClosure)' == 'true' and '$(SkipVerifyClosureForRuntime)' != 'true'">
97+
Condition="'$(ShouldVerifyClosure)' == 'true' and '$(SkipVerifyClosureForRuntime)' != 'true' and '$(SkipVerifyRuntime)' != 'true'">
10898
<Message Importance="High" Text="Testing closure for $(TestPackageID) TFM=$(TargetFramework) RID=%(RuntimeLibToTest.RuntimeIdentifier)" />
10999
<ItemGroup>
110100
<_runClosureFileNames Include="@(RuntimeLibToTestDependency->'%(FileName)');@(RuntimeLibToTest->'%(FileName)')">
@@ -123,7 +113,7 @@
123113
Inputs="%(RuntimeLibToTest.RuntimeIdentifier)"
124114
Outputs="unused"
125115
DependsOnTargets="PrepareForRuntimeTesting"
126-
Condition="'$(ShouldVerifyTypes)' == 'true'">
116+
Condition="'$(ShouldVerifyTypes)' == 'true' and '$(SkipVerifyRuntime)' != 'true'">
127117
<Message Importance="High" Text="Testing for duplicate types for $(TestPackageID) TFM=$(TargetFramework) RID=%(RuntimeLibToTest.RuntimeIdentifier)" />
128118
<ItemGroup>
129119
<_runTypesFileNames Include="@(RuntimeLibToTestDependency->'%(FileName)');@(RuntimeLibToTest->'%(FileName)')">

‎src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/netstandard2.1/settings.targets‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
<ItemGroup>
3+
<!-- https://github.com/dotnet/standard/issues/1622 -->
4+
<IgnoredTypes Include="System.Data.DataRowComparer" />
5+
<IgnoredTypes Include="System.Data.DataRowComparer`1" />
6+
<IgnoredTypes Include="System.Data.DataRowExtensions" />
7+
<IgnoredTypes Include="System.Data.DataTableExtensions" />
8+
<IgnoredTypes Include="System.Data.EnumerableRowCollection" />
9+
<IgnoredTypes Include="System.Data.EnumerableRowCollectionExtensions" />
10+
<IgnoredTypes Include="System.Data.EnumerableRowCollection`1" />
11+
<IgnoredTypes Include="System.Data.OrderedEnumerableRowCollection`1" />
12+
<IgnoredTypes Include="System.Data.TypedTableBaseExtensions" />
13+
<IgnoredTypes Include="System.Data.TypedTableBase`1" />
14+
<!-- https://github.com/dotnet/standard/issues/1791 -->
15+
<IgnoredTypes Include="System.Reflection.DispatchProxy" />
16+
</ItemGroup>
17+
</Project>

‎src/libraries/pkg/test/packageSettings/Microsoft.Windows.Compatibility/workaroundDowngrade.targets‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<ItemGroup>
3+
<!-- We cannot reference the current build of runtime.native.System.IO.Ports because its built across multiple machines -->
4+
<PackageReference Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" Include="runtime.native.System.IO.Ports" Version="$(runtimenativeSystemIOPortsVersion)" NoWarn="NU1605" />
5+
</ItemGroup>
6+
</Project>

‎src/libraries/pkg/test/packageSettings/System.Runtime.Experimental/settings.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<SkipVerifyRuntime>true</SkipVerifyRuntime>
4+
</PropertyGroup>
5+
</Project>

‎src/libraries/pkg/test/testPackages.proj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
</AllPackagesFilePath>
3434
<AllPackages Include="@(AllPackagesFilePath->'%(PackageName)')" />
3535

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

0 commit comments

Comments
 (0)