Add test dependencies

dotnet · Jun 12, 2018 · f12bf26 · f12bf26
1 parent b7c1420
commit f12bf26
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 37 deletions.
diff --git a/tests/runtest.proj b/tests/runtest.proj
@@ -423,9 +423,15 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
     </PropertyGroup>
 
     <ItemGroup>
-      <CoreCLRBinaries Include="$(CORE_ROOT)\**\*.*" />
+      <!-- Workaround for packages on which Microsoft.NetCoreApp expresses a dependency 
+      The <PackageToInclude> element doesn't allow a version to be specified and we end up with clashing assembly versions in Core_Root-->
+      <NetCoreAppPackagedAssemblies Include="System.Text.Encoding.CodePages.dll"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <CoreCLRBinaries Include="$(CORE_ROOT)\**\*.*" Exclude="$(CORE_ROOT)\**\@(NetCoreAppPackagedAssemblies -> '%(Identity)' )" />
       <HostFxFile Include="$(ToolsDir)\dotnetcli\**\$(HostFxrFileName).$(HostFxrFileExtension)" />
-      <DotnetExe Include="$(ToolsDir)\dotnetcli\$(DotnetExecutableName)" />   
+      <DotnetExe Include="$(ToolsDir)\dotnetcli\$(DotnetExecutableName)" />
       <HostPolicyFile Include="$(ToolsDir)\dotnetcli\**\hostpolicy.dll" />
     </ItemGroup>
 

diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj
@@ -2,63 +2,121 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets
-         This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here
-    -->
-    <RestoreOutputPath>$(MSBuildThisFileDirectory)obj</RestoreOutputPath>
-    <Language>C#</Language>
-    <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker>
-    <NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort>
-    <ContainsPackageReferences>true</ContainsPackageReferences>
-    <CLRTestKind>SharedLibrary</CLRTestKind>
-    <IsTestProject>false</IsTestProject>
-
-    <FxTestUtilVer>4.6.0-preview1-26604-03</FxTestUtilVer>
-    <MXNEVer>2.2.0-preview1-02902-01</MXNEVer>
+      <RestoreOutputPath>$(SourceDir)Common\CoreFX\obj</RestoreOutputPath>
+      <Language>C#</Language>
+      <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker>
+      <NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort>
+      <ContainsPackageReferences>true</ContainsPackageReferences>
+      <CLRTestKind>SharedLibrary</CLRTestKind>
+      <IsTestProject>false</IsTestProject>
+      <!-- System.Composition and System.Composition.AttributedModel use different versioning conventions -->
+      <SystemCompositionVersions>1.3.0-preview3-26501-04</SystemCompositionVersions>
+      <CoreFxTestUtilsVersion>4.6.0-preview1-26604-03</CoreFxTestUtilsVersion>
+      <XUnitNetcoreExtensionsVersion>2.2.0-preview1-02902-01</XUnitNetcoreExtensionsVersion>
   </PropertyGroup>
 
-      <!-- Switch RuntimeIdentifier according to currently running OSGroup -->
-    <PropertyGroup>
-        <RuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT'">win-x64</RuntimeIdentifier>
-        <RuntimeIdentifier Condition="'$(OSGroup)' == 'Linux'">linux-x64</RuntimeIdentifier>
-        <RuntimeIdentifier Condition="'$(OSGroup)' == 'OSX'">osx-x64</RuntimeIdentifier>
-        <NugetRuntimeIdentifier>$(RuntimeIdentifier)</NugetRuntimeIdentifier>
-    </PropertyGroup>
+  <!-- Switch RuntimeIdentifier according to currently running OSGroup -->
+  <PropertyGroup>
+      <RuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT'">win-x64</RuntimeIdentifier>
+      <RuntimeIdentifier Condition="'$(OSGroup)' == 'Linux'">linux-x64</RuntimeIdentifier>
+      <RuntimeIdentifier Condition="'$(OSGroup)' == 'OSX'">osx-x64</RuntimeIdentifier>
+      <NugetRuntimeIdentifier>$(RuntimeIdentifier)</NugetRuntimeIdentifier>
+  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="xunit.extensibility.core">
       <Version>$(XunitPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="microsoft.xunit.netcore.extensions">
-      <Version>$(MXNEVer)</Version>
+      <Version>$(XUnitNetcoreExtensionsVersion)</Version>
     </PackageReference>
     <PackageReference Include="CoreFx.Private.TestUtilities">
-        <Version>$(FxTestUtilVer)</Version>
+      <Version>$(CoreFxTestUtilsVersion)</Version>
     </PackageReference>
     <PackageReference Include="xunit.core">
-        <Version>$(XunitPackageVersion)</Version>
+      <Version>$(XunitPackageVersion)</Version>
     </PackageReference>
     <PackageReference Include="xunit.assert">
-        <Version>$(XunitPackageVersion)</Version>
+      <Version>$(XunitPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.Xml">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.CodeDom">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Management">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.ProtectedData">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Data.Odbc">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.DirectoryServices">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.DirectoryServices.Protocols">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.ServiceProcess.ServiceController">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.Packaging">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.IO.Pipelines">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Data.SqlClient">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Net.WebSockets.WebSocketProtocol">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.Caching">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Text.Encoding.CodePages">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Security.Cryptography.Pkcs">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.ServiceModel.Syndication">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Net.Http.WinHttpHandler">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Configuration.ConfigurationManager">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Composition.Hosting">
+      <Version>$(SystemCompositionVersions)</Version>
+    </PackageReference>
+    <PackageReference Include="System.Composition.AttributedModel">
+      <Version>$(SystemCompositionVersions)</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(OSGroup)' == 'Windows_NT'">
+    <!-- Windows Dependencies -->
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Win32.SystemEvents">
+      <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageToInclude Include="xunit.abstractions"/>
-    <PackageToInclude Include="xunit.assert"/>
-    <PackageToInclude Include="xunit.extensibility.core"/>
-    <PackageToInclude Include="xunit.extensibility.execution"/>
-    <PackageToInclude Include="xunit.runner.utility"/>
-    <PackageToInclude Include="CoreFx.Private.TestUtilities"/>
-    <PackageToInclude Include="microsoft.xunit.netcore.extensions" />
+    <PackageToInclude Include="@(PackageReference -> '%(Identity)' )"/>
   </ItemGroup>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-
   <PropertyGroup>
     <ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
-
 </Project>