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

Commit 785f7d3

Browse files
A-AndA-And
committed
Add test dependencies
1 parent b7c1420 commit 785f7d3

File tree

2 files changed

+115
-39
lines changed

2 files changed

+115
-39
lines changed

‎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: 107 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,133 @@
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
44
<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
6-
This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here
7-
-->
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>
5+
<RestoreOutputPath>$(SourceDir)Common\CoreFX\obj</RestoreOutputPath>
6+
<Language>C#</Language>
7+
<NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker>
8+
<NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort>
9+
<ContainsPackageReferences>true</ContainsPackageReferences>
10+
<CLRTestKind>SharedLibrary</CLRTestKind>
11+
<IsTestProject>false</IsTestProject>
12+
<!-- System.Composition and System.Composition.AttributedModel use different versioning conventions -->
13+
<SystemCompositionVersions>1.3.0-preview3-26501-04</SystemCompositionVersions>
14+
<CoreFxTestUtilsVersion>4.6.0-preview1-26604-03</CoreFxTestUtilsVersion>
15+
<XUnitNetcoreExtensionsVersion>2.2.0-preview1-02902-01</XUnitNetcoreExtensionsVersion>
16+
<!-- Xunit Abstractions is differently versioned then the rest of XUnit -->
17+
<XUnitAbstractionsVersion>2.0.1</XUnitAbstractionsVersion>
1818
</PropertyGroup>
1919

20-
<!-- Switch RuntimeIdentifier according to currently running OSGroup -->
21-
<PropertyGroup>
22-
<RuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT'">win-x64</RuntimeIdentifier>
23-
<RuntimeIdentifier Condition="'$(OSGroup)' == 'Linux'">linux-x64</RuntimeIdentifier>
24-
<RuntimeIdentifier Condition="'$(OSGroup)' == 'OSX'">osx-x64</RuntimeIdentifier>
25-
<NugetRuntimeIdentifier>$(RuntimeIdentifier)</NugetRuntimeIdentifier>
26-
</PropertyGroup>
20+
<!-- Switch RuntimeIdentifier according to currently running OSGroup -->
21+
<PropertyGroup>
22+
<RuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT'">win-x64</RuntimeIdentifier>
23+
<RuntimeIdentifier Condition="'$(OSGroup)' == 'Linux'">linux-x64</RuntimeIdentifier>
24+
<RuntimeIdentifier Condition="'$(OSGroup)' == 'OSX'">osx-x64</RuntimeIdentifier>
25+
<NugetRuntimeIdentifier>$(RuntimeIdentifier)</NugetRuntimeIdentifier>
26+
</PropertyGroup>
2727

2828
<ItemGroup>
29+
30+
<PackageReference Include="xunit.core">
31+
<Version>$(XunitPackageVersion)</Version>
32+
</PackageReference>
33+
<PackageReference Include="xunit.assert">
34+
<Version>$(XunitPackageVersion)</Version>
35+
</PackageReference>
36+
<PackageReference Include="xunit.abstractions">
37+
<Version>$(XUnitAbstractionsVersion)</Version>
38+
</PackageReference>
2939
<PackageReference Include="xunit.extensibility.core">
3040
<Version>$(XunitPackageVersion)</Version>
3141
</PackageReference>
42+
<PackageReference Include="xunit.extensibility.execution">
43+
<Version>$(XunitPackageVersion)</Version>
44+
</PackageReference>
45+
<PackageReference Include="xunit.runner.utility">
46+
<Version>$(XunitPackageVersion)</Version>
47+
</PackageReference>
3248
<PackageReference Include="microsoft.xunit.netcore.extensions">
33-
<Version>$(MXNEVer)</Version>
49+
<Version>$(XUnitNetcoreExtensionsVersion)</Version>
3450
</PackageReference>
3551
<PackageReference Include="CoreFx.Private.TestUtilities">
36-
<Version>$(FxTestUtilVer)</Version>
52+
<Version>$(CoreFxTestUtilsVersion)</Version>
3753
</PackageReference>
38-
<PackageReference Include="xunit.core">
39-
<Version>$(XunitPackageVersion)</Version>
54+
<PackageReference Include="System.Security.Cryptography.Xml">
55+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
4056
</PackageReference>
41-
<PackageReference Include="xunit.assert">
42-
<Version>$(XunitPackageVersion)</Version>
57+
<PackageReference Include="System.CodeDom">
58+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
59+
</PackageReference>
60+
<PackageReference Include="System.Management">
61+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
62+
</PackageReference>
63+
<PackageReference Include="System.Security.Cryptography.ProtectedData">
64+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
65+
</PackageReference>
66+
<PackageReference Include="System.Data.Odbc">
67+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
68+
</PackageReference>
69+
<PackageReference Include="System.DirectoryServices">
70+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
71+
</PackageReference>
72+
<PackageReference Include="System.DirectoryServices.Protocols">
73+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
74+
</PackageReference>
75+
<PackageReference Include="System.ServiceProcess.ServiceController">
76+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
77+
</PackageReference>
78+
<PackageReference Include="System.IO.Packaging">
79+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
80+
</PackageReference>
81+
<PackageReference Include="System.IO.Pipelines">
82+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
83+
</PackageReference>
84+
<PackageReference Include="System.Data.SqlClient">
85+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
86+
</PackageReference>
87+
<PackageReference Include="System.Net.WebSockets.WebSocketProtocol">
88+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
89+
</PackageReference>
90+
<PackageReference Include="System.Runtime.Caching">
91+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
92+
</PackageReference>
93+
<PackageReference Include="System.Text.Encoding.CodePages">
94+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
95+
</PackageReference>
96+
<PackageReference Include="System.Security.Cryptography.Pkcs">
97+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
98+
</PackageReference>
99+
<PackageReference Include="System.ServiceModel.Syndication">
100+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
101+
</PackageReference>
102+
<PackageReference Include="System.Net.Http.WinHttpHandler">
103+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
104+
</PackageReference>
105+
<PackageReference Include="System.Configuration.ConfigurationManager">
106+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
107+
</PackageReference>
108+
<PackageReference Include="System.Composition.Hosting">
109+
<Version>$(SystemCompositionVersions)</Version>
110+
</PackageReference>
111+
<PackageReference Include="System.Composition.AttributedModel">
112+
<Version>$(SystemCompositionVersions)</Version>
113+
</PackageReference>
114+
</ItemGroup>
115+
<ItemGroup Condition="'$(OSGroup)' == 'Windows_NT'">
116+
<!-- Windows Dependencies -->
117+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl">
118+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
119+
</PackageReference>
120+
<PackageReference Include="Microsoft.Win32.SystemEvents">
121+
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
43122
</PackageReference>
44123
</ItemGroup>
45124
<PropertyGroup>
46-
<TargetFramework>netcoreapp2.0</TargetFramework>
125+
<TargetFramework>netcoreapp2.2</TargetFramework>
47126
</PropertyGroup>
48127
<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" />
128+
<PackageToInclude Include="@(PackageReference -> '%(Identity)' )"/>
56129
</ItemGroup>
57-
58130
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
59-
60131
<PropertyGroup>
61132
<ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj\project.assets.json</ProjectAssetsFile>
62133
</PropertyGroup>
63-
64134
</Project>

0 commit comments

Comments
 (0)