Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 57b6bf7

Browse files
A-AndA-And
committed
Add test dependencies
1 parent b7c1420 commit 57b6bf7

2 files changed

Lines changed: 125 additions & 51 deletions

File tree

‎tests/runtest.proj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,15 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
423423
</PropertyGroup>
424424

425425
<ItemGroup>
426-
<CoreCLRBinaries Include="$(CORE_ROOT)\**\*.*" />
426+
<!-- Workaround for packages on which Microsoft.NetCoreApp expresses a dependency
427+
The <PackageToInclude> element doesn't allow a version to be specified and we end up with clashing assembly versions in Core_Root-->
428+
<NetCoreAppPackagedAssemblies Include="System.Text.Encoding.CodePages.dll"/>
429+
</ItemGroup>
430+
431+
<ItemGroup>
432+
<CoreCLRBinaries Include="$(CORE_ROOT)\**\*.*" Exclude="$(CORE_ROOT)\**\@(NetCoreAppPackagedAssemblies -> '%(Identity)' )" />
427433
<HostFxFile Include="$(ToolsDir)\dotnetcli\**\$(HostFxrFileName).$(HostFxrFileExtension)" />
428-
<DotnetExe Include="$(ToolsDir)\dotnetcli\$(DotnetExecutableName)" />
434+
<DotnetExe Include="$(ToolsDir)\dotnetcli\$(DotnetExecutableName)" />
429435
<HostPolicyFile Include="$(ToolsDir)\dotnetcli\**\hostpolicy.dll" />
430436
</ItemGroup>
431437

‎tests/src/Common/CoreFX/CoreFX.depproj‎

Lines changed: 117 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,132 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
3-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4-
<PropertyGroup>
5-
<!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets
2+
<Project ToolsVersion="14.0"
3+
xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
4+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
5+
<PropertyGroup>
6+
<!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets
67
This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here
78
-->
8-
<RestoreOutputPath>$(MSBuildThisFileDirectory)obj</RestoreOutputPath>
9-
<Language>C#</Language>
10-
<NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker>
11-
<NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort>
12-
<ContainsPackageReferences>true</ContainsPackageReferences>
13-
<CLRTestKind>SharedLibrary</CLRTestKind>
14-
<IsTestProject>false</IsTestProject>
15-
16-
<FxTestUtilVer>4.6.0-preview1-26604-03</FxTestUtilVer>
17-
<MXNEVer>2.2.0-preview1-02902-01</MXNEVer>
18-
</PropertyGroup>
9+
<RestoreOutputPath>$(SourceDir)Common\CoreFX\obj</RestoreOutputPath>
10+
<Language>C#</Language>
11+
<NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker>
12+
<NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort>
13+
<ContainsPackageReferences>true</ContainsPackageReferences>
14+
<CLRTestKind>SharedLibrary</CLRTestKind>
15+
<IsTestProject>false</IsTestProject>
16+
<!-- System.Composition and System.Composition.AttributedModel use different versioning conventions -->
17+
<SystemCompositionVersions>1.3.0-preview3-26501-04</SystemCompositionVersions>
18+
<CoreFxTestUtilsVersion>4.6.0-preview1-26604-03</CoreFxTestUtilsVersion>
19+
<XUnitNetcoreExtensionsVersion>2.2.0-preview1-02902-01</XUnitNetcoreExtensionsVersion>
20+
</PropertyGroup>
1921

20-
<!-- Switch RuntimeIdentifier according to currently running OSGroup -->
22+
<!-- Switch RuntimeIdentifier according to currently running OSGroup -->
2123
<PropertyGroup>
2224
<RuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT'">win-x64</RuntimeIdentifier>
2325
<RuntimeIdentifier Condition="'$(OSGroup)' == 'Linux'">linux-x64</RuntimeIdentifier>
2426
<RuntimeIdentifier Condition="'$(OSGroup)' == 'OSX'">osx-x64</RuntimeIdentifier>
2527
<NugetRuntimeIdentifier>$(RuntimeIdentifier)</NugetRuntimeIdentifier>
2628
</PropertyGroup>
2729

28-
<ItemGroup>
29-
<PackageReference Include="xunit.extensibility.core">
30-
<Version>$(XunitPackageVersion)</Version>
31-
</PackageReference>
32-
<PackageReference Include="microsoft.xunit.netcore.extensions">
33-
<Version>$(MXNEVer)</Version>
34-
</PackageReference>
35-
<PackageReference Include="CoreFx.Private.TestUtilities">
36-
<Version>$(FxTestUtilVer)</Version>
37-
</PackageReference>
38-
<PackageReference Include="xunit.core">
39-
<Version>$(XunitPackageVersion)</Version>
40-
</PackageReference>
41-
<PackageReference Include="xunit.assert">
42-
<Version>$(XunitPackageVersion)</Version>
43-
</PackageReference>
44-
</ItemGroup>
45-
<PropertyGroup>
46-
<TargetFramework>netcoreapp2.0</TargetFramework>
47-
</PropertyGroup>
48-
<ItemGroup>
49-
<PackageToInclude Include="xunit.abstractions"/>
50-
<PackageToInclude Include="xunit.assert"/>
51-
<PackageToInclude Include="xunit.extensibility.core"/>
52-
<PackageToInclude Include="xunit.extensibility.execution"/>
53-
<PackageToInclude Include="xunit.runner.utility"/>
54-
<PackageToInclude Include="CoreFx.Private.TestUtilities"/>
55-
<PackageToInclude Include="microsoft.xunit.netcore.extensions" />
56-
</ItemGroup>
30+
<ItemGroup>
31+
<PackageReference Include="xunit.extensibility.core">
32+
<Version>$(XunitPackageVersion)</Version>
33+
</PackageReference>
34+
<PackageReference Include="microsoft.xunit.netcore.extensions">
35+
<Version>$(XUnitNetcoreExtensionsVersion)</Version>
36+
</PackageReference>
37+
<PackageReference Include="CoreFx.Private.TestUtilities">
38+
<Version>$(CoreFxTestUtilsVersion)</Version>
39+
</PackageReference>
40+
<PackageReference Include="xunit.core">
41+
<Version>$(XunitPackageVersion)</Version>
42+
</PackageReference>
43+
<PackageReference Include="xunit.assert">
44+
<Version>$(XunitPackageVersion)</Version>
45+
</PackageReference>
46+
<PackageReference Include="System.Security.Cryptography.Xml">
47+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
48+
</PackageReference>
49+
<PackageReference Include="System.CodeDom">
50+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
51+
</PackageReference>
52+
<PackageReference Include="System.Management">
53+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
54+
</PackageReference>
55+
<PackageReference Include="System.Security.Cryptography.ProtectedData">
56+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
57+
</PackageReference>
58+
<PackageReference Include="System.Data.Odbc">
59+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
60+
</PackageReference>
61+
<PackageReference Include="System.DirectoryServices">
62+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
63+
</PackageReference>
64+
<PackageReference Include="System.DirectoryServices.Protocols">
65+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
66+
</PackageReference>
67+
<PackageReference Include="System.ServiceProcess.ServiceController">
68+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
69+
</PackageReference>
70+
<PackageReference Include="System.IO.Packaging">
71+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
72+
</PackageReference>
73+
<PackageReference Include="System.IO.Pipelines">
74+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
75+
</PackageReference>
76+
<PackageReference Include="System.Data.SqlClient">
77+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
78+
</PackageReference>
79+
<PackageReference Include="System.Net.WebSockets.WebSocketProtocol">
80+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
81+
</PackageReference>
82+
<PackageReference Include="System.Runtime.Caching">
83+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
84+
</PackageReference>
85+
<PackageReference Include="System.Text.Encoding.CodePages">
86+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
87+
</PackageReference>
88+
<PackageReference Include="System.Security.Cryptography.Pkcs">
89+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
90+
</PackageReference>
91+
<PackageReference Include="System.ServiceModel.Syndication">
92+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
93+
</PackageReference>
94+
<PackageReference Include="System.Net.Http.WinHttpHandler">
95+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
96+
</PackageReference>
97+
<PackageReference Include="System.Configuration.ConfigurationManager">
98+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
99+
</PackageReference>
100+
<PackageReference Include="System.Composition.Hosting">
101+
<Version>$(SystemCompositionVersions)</Version>
102+
</PackageReference>
103+
<PackageReference Include="System.Composition.AttributedModel">
104+
<Version>$(SystemCompositionVersions)</Version>
105+
</PackageReference>
106+
</ItemGroup>
107+
108+
<ItemGroup Condition="'$(OSGroup)' == 'Windows_NT'">
109+
<!-- Windows Dependencies -->
110+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl">
111+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
112+
</PackageReference>
113+
<PackageReference Include="Microsoft.Win32.SystemEvents">
114+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
115+
</PackageReference>
116+
</ItemGroup>
117+
118+
<PropertyGroup>
119+
<TargetFramework>netcoreapp2.2</TargetFramework>
120+
</PropertyGroup>
121+
122+
<ItemGroup>
123+
<PackageToInclude Include="@(PackageReference -> '%(Identity)' )"/>
124+
</ItemGroup>
57125

58-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
126+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
59127

60-
<PropertyGroup>
61-
<ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj\project.assets.json</ProjectAssetsFile>
62-
</PropertyGroup>
128+
<PropertyGroup>
129+
<ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj\project.assets.json</ProjectAssetsFile>
130+
</PropertyGroup>
63131

64132
</Project>

0 commit comments

Comments
 (0)